GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix Avatar-unlink plus better logging in TwitterImport

Browse Source
This commit is contained in:
Mikael Nordfeldth 2013-10-05 11:32:43 +02:00
parent 1795267df9
commit d1558a1d8b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Avatar.php
View File

@ -54,7 +54,7 @@ class Avatar extends Managed_DataObject
function delete() function delete()
{ {
$filename = $this->filename; $filename = $this->filename;
if (parent::delete()) { if (parent::delete() && file_exists(Avatar::path($filename))) {
@unlink(Avatar::path($filename)); @unlink(Avatar::path($filename));
} }
} }

2
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
View File

@ -23,7 +23,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
// Tune number of processes and how often to poll Twitter // Tune number of processes and how often to poll Twitter
// XXX: Should these things be in config.php? // XXX: Should these things be in config.php?
define('MAXCHILDREN', 2); define('MAXCHILDREN', 2);
define('POLL_INTERVAL', 60); // in seconds define('POLL_INTERVAL', 70); // in seconds, Twitter API v1.1 says 15 calls every 15 mins
$shortoptions = 'di::'; $shortoptions = 'di::';
$longoptions = array('id::', 'debug'); $longoptions = array('id::', 'debug');

4
plugins/TwitterBridge/lib/twitterimport.php
View File

@ -317,17 +317,19 @@ class TwitterImport
if ($avatar->filename === $filename) { if ($avatar->filename === $filename) {
return null; return null;
} }
common_debug(__METHOD__ . " - Updating profile avatar (profile_id={$profile->id}) " .
"from {$avatar->filename} to {$filename}");
// else we continue with creating a new avatar // else we continue with creating a new avatar
} catch (Exception $e) { } catch (Exception $e) {
// Avatar was not found. We can catch NoResultException or FileNotFoundException // Avatar was not found. We can catch NoResultException or FileNotFoundException
// but generally we just want to continue creating a new avatar. // but generally we just want to continue creating a new avatar.
common_debug(__METHOD__ . " - No avatar found for (profile_id={$profile->id})");
} }
$url = "{$path_parts['dirname']}/{$img_root}_{$this->avatarsizename}{$ext}"; $url = "{$path_parts['dirname']}/{$img_root}_{$this->avatarsizename}{$ext}";
$mediatype = $this->getMediatype(mb_substr($ext, 1)); $mediatype = $this->getMediatype(mb_substr($ext, 1));
try { try {
common_debug(__METHOD__ . " - Updating profile avatar (profile_id={$profile->id} to {$filename}");
$this->newAvatar($profile, $url, $filename, $mediatype); $this->newAvatar($profile, $url, $filename, $mediatype);
} catch (Exception $e) { } catch (Exception $e) {
if (file_exists(Avatar::path($filename))) { if (file_exists(Avatar::path($filename))) {