Mikael Nordfeldth
0fd2ad649e
Conversation IDs (again) no longer based on Notice ID
2016-01-06 13:58:46 +01:00
Mikael Nordfeldth
59d3bbe037
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-01-06 00:53:20 +01:00
mmn
d45457e4a9
Merge branch 'nightly' into 'nightly'
...
only count post-notices (i.e. don't include activity-notices in statuses_count in the API)
See merge request !73
2016-01-05 23:53:08 +00:00
Mikael Nordfeldth
1946197a1c
Merge request #10 by aroque but in a slightly different version
2016-01-06 00:48:03 +01:00
hannes
32549cfd8c
$notices->verb = ActivityVerb::POST;
2016-01-05 23:29:48 +00:00
Mikael Nordfeldth
31c8416a8f
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-01-06 00:24:41 +01:00
mmn
956e053da6
Merge branch 'lookup_url_fix' into 'nightly'
...
makes url lookup work and adds full url to href for shortened links
See merge request !74
2016-01-05 23:24:16 +00:00
Mikael Nordfeldth
792b62874e
Require Profile for Profile->getLists
2016-01-06 00:18:10 +01:00
hannes
1c25cffbd8
add $redir->redir_url to use in common_linkify()
2016-01-05 23:07:24 +00:00
Mikael Nordfeldth
3d66d960a1
Require Profile for Profile->getOtherTags
2016-01-06 00:07:15 +01:00
Mikael Nordfeldth
8ad6b8809a
Don't abort on too long notices in Notice::saveActivity
2016-01-05 17:31:09 +01:00
hannes
e10691abea
only count post-notices (i.e. don't include activity-notices in statuses_count in the API)
2016-01-05 14:19:33 +00:00
Mikael Nordfeldth
701f6ff608
Allow Profile->getCurrentNotice to send scoped profile info
...
not that we're using it anywhere (yet anyway).
2016-01-04 21:42:24 +01:00
Mikael Nordfeldth
6a16939830
Profile->getCurrentNotice handles PrivateStreamException
2016-01-04 21:38:41 +01:00
Mikael Nordfeldth
b4b57bba54
EmptyIdException to make sure we get the right in catch
2016-01-03 22:56:48 +01:00
Mikael Nordfeldth
7266a968f9
Err, forgot semicolon.
2016-01-03 22:22:58 +01:00
Mikael Nordfeldth
f467b89f40
Try-catch on profile deletion unsubscribe actions
2016-01-03 22:21:03 +01:00
Mikael Nordfeldth
c19964094b
Pending subscription requests now work as they should
...
A slight layout issue with the buttons still persists
2016-01-03 20:27:53 +01:00
Mikael Nordfeldth
b374e5f08b
If a user has a private stream, assume a moderated subscription policy
2016-01-03 19:33:26 +01:00
Mikael Nordfeldth
df0f9547b5
Handle private streams better (failed to show profile before)
2016-01-03 19:16:29 +01:00
Mikael Nordfeldth
336f099241
Don't store object type for verbs (as they don't have it)
2016-01-02 16:05:20 +01:00
Mikael Nordfeldth
0dfafe2567
NewnoticeAction now uses Notice::saveActivity(...)
2016-01-01 20:18:54 +01:00
Mikael Nordfeldth
f4309ed715
whitespace switch for code layout
2016-01-01 18:43:37 +01:00
Mikael Nordfeldth
e02c10a589
common_render_content doesn't require a Profile now
2016-01-01 18:40:58 +01:00
Mikael Nordfeldth
ad4beb9091
->getID() instead of ->id
2016-01-01 18:21:54 +01:00
Mikael Nordfeldth
10973dcf69
Don't require a notice object to common_linkify_mentions
2016-01-01 18:20:42 +01:00
Mikael Nordfeldth
86106b890a
Output fixed sizes of thumbnails so we don't get jumpy scrolling
2016-01-01 14:13:16 +01:00
Mikael Nordfeldth
7adf1c99fc
s/LOG_ERROR/LOG_ERR/
2015-12-31 13:04:50 +01:00
Mikael Nordfeldth
7f1ce07e9f
Logging destinations and unnecessary debug
2015-12-31 13:00:20 +01:00
Mikael Nordfeldth
6606781916
Proper error message in exception
2015-12-31 12:41:02 +01:00
Mikael Nordfeldth
df19791a8f
Wups, $notice not $stored in the old function...
2015-12-31 02:37:42 +01:00
Mikael Nordfeldth
8b0fdfb4a0
Notice conversation is perhaps not set yet
2015-12-31 02:35:13 +01:00
Mikael Nordfeldth
7cf6aaecd0
Don't do saveKnownReplies unless it's a verb=post
2015-12-31 02:31:35 +01:00
Mikael Nordfeldth
66289d3e76
Use recently implemented functions in saveKnownReplies
2015-12-31 02:22:49 +01:00
Mikael Nordfeldth
29847f172f
setPassword now runs validate too
2015-12-30 17:51:57 +01:00
Mikael Nordfeldth
d7a8ee99af
Added User->setPassword($password)
2015-12-30 17:44:24 +01:00
Mikael Nordfeldth
998db39b1a
Notification mails are sent again fixes ssue #99
...
The problem was that the ActivityVerbPostPlugin handled 'post' verbs
but didn't handle the notifications for them, so now we're returning
true in the event so the default behaviour (sending to 'getReplies'
recipients) is done by default.
2015-12-30 17:35:47 +01:00
hannes
08be0e5c67
fixes this issue: https://quitter.se/notice/4344600
2015-12-30 01:54:48 +00:00
Mikael Nordfeldth
4bc0b374bc
File_redirection should get URLs properly
2015-12-27 21:36:23 +01:00
Mikael Nordfeldth
556d6e198f
Confirm_address field address_extra _can_ be NULL
2015-12-27 15:01:28 +01:00
Mikael Nordfeldth
12d77ac3e4
varchar to text since there's no reason to limit the fields
...
They caused problems when quitter.se was upgrading because someone was
named ryanjjjjjjjjjjjjjjjjjjj[and more than 191 'j's] etc.
2015-12-27 11:50:11 +01:00
Mikael Nordfeldth
0ac71c2b7b
Duplicate URI means we have it already, I assume
2015-12-27 01:40:00 +01:00
mmn
48f31928e9
Merge branch 'autocomplete-group' into 'nightly'
...
Autocomplete group
Group autocompletion wasn't working for a couple of reasons:
1. $profile wasn't set (d8092207c03e830dad37!68
2015-12-23 21:04:18 +00:00
Chimo
90945e548b
Profile_prefs::getAll fix prefs loop
...
DataObject::fetch doesn't return an object.
2015-12-17 14:58:06 +00:00
Chimo
71119e4980
Profile_prefs::getAll fix call to listFind
...
2nd argument needs to be an array
2015-12-17 14:55:39 +00:00
Chimo
3e830dad37
Make Profile::getUri work with Groups
...
and by extension Profile::getAcctUri
2015-12-15 21:50:10 -05:00
Mikael Nordfeldth
ef4c11d262
Better checks for defined array indexes
2015-12-15 11:50:57 +01:00
mmn
2dd968f94e
Merge branch 'group-join-rejections' into 'nightly'
...
Fix group-join request rejections
Relates to #105
See merge request !65
2015-12-14 20:48:18 +00:00
mmn
d5d8068632
Merge branch 'group-members-pending' into 'nightly'
...
Fix "pending members" group list
Related to #104
See merge request !64
2015-12-14 20:47:47 +00:00
Mikael Nordfeldth
20592f184d
getID() will complain loudly if something is wrong
...
(just ->id would not)
2015-12-14 21:44:59 +01:00
Mikael Nordfeldth
42c653a9d0
Merge commit '5c4a7a10' into nightly
...
hannes making sure notice is a repeat and not a delete activity notice
2015-12-14 21:42:08 +01:00
Mikael Nordfeldth
441e2c8d34
redir_info only has data if we ran discovery
2015-12-08 11:42:09 +01:00
Mikael Nordfeldth
376d545082
Remember to purify HTML...
2015-12-05 15:56:50 +01:00
Chimo
6d9ea620a3
Fix group-join request rejections
2015-12-04 16:11:15 +00:00
Chimo
a06dc57621
Fix "pending members" group list
2015-12-04 15:47:40 +00:00
hannes
1eba33590b
ActivityVerb::SHARE instead of http://activitystrea.ms/schema/1.0/share
2015-11-22 20:26:08 +00:00
hannes
70695a1463
make sure the notice is a repeat, i.e. not a delete activity notice that also can have a repeat_of set
2015-11-22 18:59:56 +00:00
mmn
b33b40db45
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.
See merge request !57
2015-11-20 17:50:01 +00:00
Mikael Nordfeldth
d0e7203d88
Make it clearer that we're handling group IDs
2015-11-08 23:31:45 +01:00
abjectio
507f9a28c0
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
2015-11-05 17:34:34 +01:00
Stephen Paul Weber
a9b1b60a97
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.
2015-11-02 05:15:08 +00:00
Chimo
d7b58491ce
Add User_group::getObjectType
...
Since 174586bd51
2015-10-29 20:11:57 -04:00
abjectio
aa5bbdf6e5
Bug in catch(Exception) - parameter wrongly written
2015-10-16 23:48:05 +02:00
abjectio
626333a59e
geParent() method will fail if the parent notice does not exist in the notice table. See https://quitter.no/notice/709400
2015-10-14 18:50:39 +02:00
Mikael Nordfeldth
d260808cd3
intval for type assurance
2015-10-14 01:16:22 +02:00
Mikael Nordfeldth
79c40bc73b
Type-aware comparison is necessary for Notice is_local/scope
2015-10-14 00:42:15 +02:00
Mikael Nordfeldth
236bf0b0f5
Remote notice creators should not have notice is_local default to LOCAL_PUBLIC
2015-10-14 00:10:01 +02:00
Mikael Nordfeldth
5b307c0417
Add a url test in Notice::saveActivity
2015-10-13 23:39:40 +02:00
Mikael Nordfeldth
4b69ef41e2
Bad variable name in File_redirection
2015-10-13 22:57:45 +02:00
Mikael Nordfeldth
67e7bc55ea
Bookmarks are almost migrated
...
Now they are just not being saved in the bookmark table.
2015-10-12 17:48:23 +02:00
Mikael Nordfeldth
7834e67583
Just a functionifying of Notice->rendered
2015-10-12 17:16:13 +02:00
mmn
77951647ce
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.
[1]
7f30e61402/actions/newapplication.php (L176)7f30e61402/actions/newapplication.php (L186)!29
2015-10-10 20:34:22 +00:00
Mikael Nordfeldth
fe9457daea
Syntax and minor fixes
...
Deleted_notice and Bookmark getByPK assocative array for example.
2015-10-10 22:23:24 +02:00
Mikael Nordfeldth
174586bd51
Some code aligning for consistency
2015-10-10 22:09:51 +02:00
Mikael Nordfeldth
37f2da03e1
newUri might as well be put in Managed_DataObject
2015-10-10 21:31:26 +02:00
Mikael Nordfeldth
6376b78a80
I think I have made the delete verb generate proper AS
...
ActivityStreams had a different/better definition than me
in how to define the Delete verb data:
http://wiki.activitystrea.ms/w/page/23541872/Delete
2015-10-10 11:08:17 +02:00
Mikael Nordfeldth
2dfd34b12d
Post verb default type is 'note'
2015-10-09 16:18:12 +02:00
Mikael Nordfeldth
0bdbb32f3b
Consistent camelcasing
2015-10-09 15:45:05 +02:00
Mikael Nordfeldth
ec19661312
Can't use return-value in empty()
2015-10-04 22:31:07 +02:00
Mikael Nordfeldth
7c68537b06
Deletes now federated. But might not be handled properly
2015-10-03 14:39:49 +02:00
Mikael Nordfeldth
db9f68e651
Sigh, use the correct variable name...
2015-10-03 13:45:06 +02:00
Mikael Nordfeldth
66a1d63dd0
if is_local was not provided to Notice:saveActivity it wouldn't be set
2015-10-03 13:24:31 +02:00
Mikael Nordfeldth
dac617d95a
I think all the notice deletion calls are event-compatible now
...
This means we can handle DeleteNoticeAsProfile in plugins, such as
the ActivityModeration plugin.
2015-10-03 12:26:09 +02:00
Mikael Nordfeldth
88f7bb1ed5
Some work on ActivityModeration with notice deletion
...
Let's now create an event called DeleteNotice and also make sure we
handle the onNoticeDeleteRelated properly in ActivityModeration to
avoid possible endless loops etc.
2015-10-03 02:02:37 +02:00
Mikael Nordfeldth
80bc7f0e25
File handling changes for better logic
...
Also prepares for StoreRemoteMediaPlugin, coming up...
2015-10-01 22:14:49 +02:00
Mikael Nordfeldth
3a6c98ff16
NoResultException is common if reply_to was not cleared on parent deletion
2015-09-30 22:55:06 +02:00
Mikael Nordfeldth
a09cf51b99
Move Ostatus_profile->processPost function into plugin
2015-09-29 15:19:13 +02:00
Mikael Nordfeldth
21a12a2f60
Some conversationRoot lookups failed with deleted notices
2015-09-28 22:36:04 +02:00
Mikael Nordfeldth
ad3b62cf2f
ShowprofiletagAction now extends ShowstreamAction
2015-09-27 23:46:30 +02:00
Mikael Nordfeldth
edb73ec480
Use exception instead of if-statement in File::saveNew
2015-09-27 12:29:38 +02:00
Mikael Nordfeldth
02418cffd8
Be harsher on database saving failure for File entry
2015-09-27 11:54:52 +02:00
Mikael Nordfeldth
604ed1fd9a
Prepare for ActivityModerationPlugin
2015-09-10 15:55:37 +02:00
Mikael Nordfeldth
a541533e04
Use Profile objects in Subscription::saveNew
2015-09-06 02:07:52 +02:00
Mikael Nordfeldth
917a547f91
Subscription::saveNew is a static function
2015-09-06 02:01:39 +02:00
Chimo
dc5dd69f2e
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.
[1]
7f30e61402/actions/newapplication.php (L176)7f30e61402/actions/newapplication.php (L186)
2015-09-05 17:02:17 -04:00
Mikael Nordfeldth
7f30e61402
Oops, forgot Notice_location PHP file
2015-09-04 22:30:33 +02:00
Mikael Nordfeldth
3c86542a40
Move notice location data to Notice_location
...
Will probably take a _long_ time to do scripts/upgrade.php but don't
worry, it can be aborted and resumed.
2015-09-04 22:25:11 +02:00
Mikael Nordfeldth
1e07f8c045
Incorrect use of DataObject type matching after ->find()
2015-09-04 20:35:11 +02:00
Mikael Nordfeldth
5b09a150bc
Increased debugging and fixing conversation stitching for saveActivity
2015-07-18 19:19:16 +02:00
Mikael Nordfeldth
e0084a6fdf
Exception handling regarding Foreign_link
2015-07-18 11:39:34 +02:00
