mmn [Fri, 20 Nov 2015 17:50:01 +0000 (17:50 +0000)]
Merge branch 'refactor-file-processNew' into 'nightly'
Refactor on File::processNew
The code was so involved there was even a comment asking for a refactor.
Now, File_redirection::where always returns a nice File_redirection
object instead of an array or string or nothing. The object is
either one which already existed or else a new, unsaved object.
Instead of duplicating "does it exist" checks everywhere, do it in
File_redirection::where. You either get what exists or something to save.
An unsaved File_redirection may be paired with an unsaved File.
You will want to save the File first (using ->saveFile()) and put the
id in File_redirection#file_id before saving.
mmn [Fri, 20 Nov 2015 17:46:53 +0000 (17:46 +0000)]
Merge branch 'master' into 'master'
block check can't be done inside the same try-expression as Subscription::getSub…
…scription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them.
hannes [Thu, 19 Nov 2015 15:55:11 +0000 (15:55 +0000)]
block check can't be done inside the same try-expression as Subscription::getSubscription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them.
mmn [Fri, 6 Nov 2015 12:28:00 +0000 (12:28 +0000)]
Merge branch 'nightly' into 'nightly'
getParent() method will fail if the parent notice does not exist in the notice table
getParent() method will fail if the parent notice does not exist in the notice table. See https://quitter.no/notice/709400
There are situations where a user delete his notice which could be a parent notice to a reply.
The user which replied to this deleted notice will then have broken timeline.
This is caused by the Notice.getParent() method which tries to return the selection of non existing parent notice.
I've tried this code on quitter.no and it seems to work.
mmn [Thu, 5 Nov 2015 15:13:16 +0000 (15:13 +0000)]
Merge branch 'renew-pshb' into 'master'
Actually use the renew code
We have the code to check once a day and renew, but currently it's
just in a script directory. This change adds an event listener
hook to check and renew subscriptions daily.
mmn [Thu, 5 Nov 2015 15:01:07 +0000 (15:01 +0000)]
Merge branch 'twitter-verb' into 'nightly'
TwitterBridge: Add $notice->verb on import
Since /plugins/ActivityModeration::onStartNotieSave expects it to be there when calling ActivityUtils::compareVerbs. Otherwise, the following exception is unhandled:
mmn [Thu, 5 Nov 2015 14:57:29 +0000 (14:57 +0000)]
Merge branch 'group-join' into 'nightly'
Add User_group::getObjectType
Since 174586bd512, I'm unable to join groups with the logs complaining
about getObjectType not existing on the User_group object.
Note: I'm not sure if this is the correct value to return here, but I
was able to joing groups successfully using this. Let me know if it needs
to be changed and I'll update the Merge Request!
The code was so involved there was even a comment asking for a refactor.
Now, File_redirection::where always returns a nice File_redirection
object instead of an array or string or nothing. The object is
either one which already existed or else a new, unsaved object.
Instead of duplicating "does it exist" checks everywhere, do it in
File_redirection::where. You either get what exists or something to save.
An unsaved File_redirection may be paired with an unsaved File.
You will want to save the File first (using ->saveFile()) and put the
id in File_redirection#file_id before saving.
Chimo [Tue, 27 Oct 2015 14:12:33 +0000 (10:12 -0400)]
TwitterBridge: Add $notice->verb on import
Since /plugins/ActivityModeration::onStartNotieSave expects it to be there when calling ActivityUtils::compareVerbs. Otherwise, the following exception is unhandled:
We have the code to check once a day and renew, but currently it's
just in a script directory. This change adds an event listener
hook to check and renew subscriptions daily.
Webmention and Pingback both need the exact URL we are going to claim to link to to be present in our HTML source, so send them our actual original link.
Webmention clients are supposed to resolve this link. Pingback clients may still fail on shortened links.
This is especially useful for partial federation with remote accounts
that are not fully OStatus-enabled but support a pingback protocol.
Such accounts will still be notified of replies and repeats of their
content even without OStatus support, thus adding to the federated
universe.
mmn [Sat, 10 Oct 2015 20:36:04 +0000 (20:36 +0000)]
Merge branch 'translation-snapshot-october-2015' into 'nightly'
Snapshot of the Transifex translation project - October 2015
It's been 7 months since the last localization update, and the files in the repository are out of sync with the current state of the project. Our Transifex team has since grown to 63 translators, many of them are active members of the GNU social community. I don't know how we will resolve this situation, but it is clear that we have to act. If you plan to redesign the plugin system in the future to support external repository for localizations, that would work as well. But now, please let us do an update. It would be a serious disgrace to the community to throw all of their hard work away.
mmn [Sat, 10 Oct 2015 20:34:22 +0000 (20:34 +0000)]
Merge branch 'oauth-default-icon' into 'nightly'
Add default icon to OAuth apps
When MySQL runs in strict mode, it doesn't seem possible to add a new OAuth app.
This is because:
* The 'icon' field has no defaults and also has NOT NULL constraint.
* GS uploads/sets the icon[1] (if provided) after the SQL insert[2]
The easiest fix seemed to be to provide a default icon value.
This change sets the default to the "blue peg" default avatar from the base theme.
projects / quix0rs-gnu-social.git / log