Commit Graph

20157 Commits

Author SHA1 Message Date
Mikael Nordfeldth
d3a8896b2a Merge commit 'refs/merge-requests/26' of https://gitorious.org/social/mainline into merge-requests/26 2014-12-09 13:45:15 +01:00
Mikael Nordfeldth
6b48db2539 Merge commit 'refs/merge-requests/27' of https://gitorious.org/social/mainline into merge-requests/27 2014-12-09 13:30:47 +01:00
Joshua Judson Rosen
06235a3aa3 Consistently root autostitched conversations at the oldest notice. 2014-12-08 22:39:36 -05:00
Joshua Judson Rosen
f71eeaee5a OStatus/scripts/update-profile-data.php: print updated fullnames
Now that we can actually update them again.
2014-12-08 22:06:29 -05:00
Joshua Judson Rosen
238095a719 Parse remote users' fullnames from PoCo::displayName elements
Try this first; use activity:subject->atom:title only as a fallback.

The code that output activity:subject was removed 2013-10-08,
and it it was deprecated for years before that....
2014-12-08 21:55:51 -05:00
Mikael Nordfeldth
812d1eead9 Stronger typing in Ostatus_profile 2014-12-08 19:52:00 +01:00
Joshua Judson Rosen
20599d2964 stopdaemons.sh: pass site-specifier args through to getvaliddaemons.php 2014-12-06 18:54:15 -05:00
Mikael Nordfeldth
e7c6c6fc76 Merge commit 'refs/merge-requests/19' of https://gitorious.org/social/mainline into merge-requests/19 2014-12-06 20:18:52 +01:00
Mikael Nordfeldth
bb31394cce Merge commit 'refs/merge-requests/23' of https://gitorious.org/social/mainline into merge-requests/23 2014-12-06 20:12:17 +01:00
Mikael Nordfeldth
48680942fd Avoid undefined variables. 2014-12-06 19:56:21 +01:00
Mikael Nordfeldth
e006b73505 Revert "Report a 404 not found if no posts found for User timeline"
This reverts commit 5295e8d4de.

Just reply with an empty timeline...
2014-12-04 19:45:27 +01:00
Joshua Judson Rosen
9a9f6f0502 Use HTTPS links for Google and Yahoo!
They both support it--so why not?
2014-12-03 22:55:34 -05:00
Joshua Judson Rosen
c52c090298 Add Ixquick as a fallback search link
People like that one, too.
2014-12-03 22:54:27 -05:00
Joshua Judson Rosen
67539fd1cc Add DuckDuckGo as a fallback search link
People like it.
2014-12-03 22:48:28 -05:00
Joshua Judson Rosen
f9d815db64 Correctly spell "Yahoo!"
With the trailing bang(!).
2014-12-03 22:46:50 -05:00
Joshua Judson Rosen
b45b7c153e SearchAction: don't list dead web search-engines
tweetscan.com is a parked domain.

http://www.twingly.com/search?content=microblog says:
"Microblog search has been removed. Use https://twitter.com/search-home".

http://collecta.com/ says "We have removed our consumer facing site".
2014-12-03 22:44:54 -05:00
Hannes Mannerheim
b81857656f delete groups from groups directory, for admins 2014-12-02 15:31:27 +01:00
Mikael Nordfeldth
492d8e72ed Merge aqeeliz's commit 'refs/merge-requests/20' of git://gitorious.org/social/mainline into merge-requests/20 2014-12-02 14:53:52 +01:00
Joshua Judson Rosen
69fec16de2 common_path(): use HTTPS if current URL is HTTPS
Bring common_path() back into harmony with common_local_url(),
which started doing this 2013-03-25.

Shouldn't need to spread "StatusNet::isHTTPS()" logic all over
wherever common_path() is called; just DTRT automatically instead.
2014-12-02 14:47:03 +01:00
Mikael Nordfeldth
d671b7b289 debug output was referencing wrong variable 2014-12-01 19:19:16 +01:00
Mikael Nordfeldth
d02f3c4648 Conversation URIs could be NULL on upgrade 2014-11-27 18:56:57 +01:00
Mikael Nordfeldth
8ad4d1baf8 Version bump to 1.1.3 since conversation tracking 2014-11-27 17:12:36 +01:00
Mikael Nordfeldth
9f09b136b8 Adding crc32 to uniqueify conversation URIs
This really should be a UUID or something else totally unexpected
but I figure that crc32 is good enough for now. The reason we keep
the main structure is because some third party scripts have begun
relying upon the tag URI format to parse out domain name, type etc.
2014-11-27 17:05:01 +01:00
Mikael Nordfeldth
72d1c3c73e fetch conversation URI in processPost, not processShare 2014-11-27 16:51:21 +01:00
Mikael Nordfeldth
1b449ea705 scripts/upgrade.php would fail if Profile_prefs did not exist
A checkschema.php run would've done it, but that would require an
additional step to our upgrade procedure.
2014-11-27 14:46:10 +01:00
Mikael Nordfeldth
411ce0629c If a Notice insert fails, don't continue processing it 2014-11-27 14:29:50 +01:00
Mikael Nordfeldth
e0d0a59706 Move Conversation creation out of insert() to allow URI setting
This means we import the URI string from remote instances to track their
conversations and are able to stitch together replies in a single thread.

We might have to try to avoid collisions so noone remotely can predict
conversation URIs which we generate on our server, causing a DoS kind of
problem.
2014-11-27 14:27:41 +01:00
Mikael Nordfeldth
8a4575ea76 Conversation URI cannot be null 2014-11-27 14:15:42 +01:00
Mikael Nordfeldth
bdb4a41696 Use remote conversation URI info to stitch convos together
If we know the URI sent from the remote party, and we don't know the
notice it is replying to, we might still be able to put it in the same
conversation thread!
2014-11-27 14:06:10 +01:00
Mikael Nordfeldth
343291262e ostatus:conversation element instead of link rel=""
Mainly because the atom:link element requires a "web resource" but we
wish to supply a URI which might not be HTTP. We'll leave the old
atom:link element however since it's in the OStatus 1.0 Draft2 docs
and nothing newer has been released yet.
2014-11-27 13:47:31 +01:00
Mikael Nordfeldth
a3ded586b6 Namespaced elements now available in xmloutputter 2014-11-27 13:36:29 +01:00
Aqeel Zafar
290d7ffb98 Fix T60 Avatar upload text is squished 2014-11-27 12:11:02 +05:00
Joshua Judson Rosen
cff8c462da sendemailsummary.php: correct path to INSTALLDIR
So that we can actually find commandline.inc.

This should have been updated when the files in the EmailSummary tree
where moved down a level into subdirectories.
2014-11-24 20:28:31 -05:00
Mikael Nordfeldth
8056097478 Try to lookup the profile if we don't know it yet 2014-11-24 23:50:42 +01:00
Mikael Nordfeldth
720c2c9ff2 Ostatus_profile->checkAuthorship returns Profile
not Ostatus_profile
2014-11-24 23:40:06 +01:00
Mikael Nordfeldth
3bf1478f97 Bad parameter count for checkAuthorship
At the same time we change this to call ActivityUtils::checkAuthorship
instead to let the retrieval/verification go through event handling.

rozzin (Joshua Judson Rosen) found this error. Thanks.
2014-11-24 12:49:20 +01:00
Joshua Judson Rosen
4b875e0fd0 Fix OStatus groups by making Ostatus_profile::localProfile() work for groups
We need to look up a feed profile for HandleFeedEntryWithProfile events,
regardless of whether they're an OStatus user, group, or something else;
this is the least hairy way of doing that--the alternative being
to keep spreading the same logic all over the calling code.

Theoretically, this change might allow OStatusGroups to be recorded
as the authors of activities if they pass through any authorless
activities; but that's why we have checkAuthorship().
2014-11-24 12:30:37 +01:00
Joshua Judson Rosen
d2e1a8c706 Ostatus_profile::checkAuthorship(): throw ServerException when bogus non-authorship is detected
Similarly to what ActivityUtils::checkAuthorship does; try to ensure
that activities from ambiguous OStatus feeds (groups and peopletags)
that require explicit authorship don't get in without explicit authors.
2014-11-24 12:29:41 +01:00
Joshua Judson Rosen
2d7804b88f UserEmailSummaryHandler: use $notice->getLocalUrl(), not getUrl()
getUrl() doesn't work on all notices anymore.
2014-11-23 23:28:30 -05:00
Joshua Judson Rosen
bf0f22744d UserEmailSummaryHandler: Update notice-fetching logic
InboxNoticeStream::getNotices() no longer returns an ArrayWrapper;
just fetch notices normally via $notice->fetch(), so that
we can actually get the top notice-ID and update email_summary_status
accordingly--and not mail about the same notices repeatedly.
2014-11-23 23:28:28 -05:00
Joshua Judson Rosen
2f506dde28 UserEmailSummaryHandler: correct instantiation of InboxNoticeStream
It only takes a single Profile argument....
2014-11-23 23:28:27 -05:00
Joshua Judson Rosen
9fd2541b52 QueueManager: don't assume all non-XML strings are JSON
Some of the standard plugins queue simple, unstructured numbers--
e.g.: EmailSummary and OfflineBackup both queue user-IDs.
2014-11-23 23:24:16 -05:00
Mikael Nordfeldth
5295e8d4de Report a 404 not found if no posts found for User timeline 2014-11-22 12:29:13 +01:00
Mikael Nordfeldth
d1b10ee92b Don't define a variable in a function call 2014-11-22 12:26:51 +01:00
Mikael Nordfeldth
a83e20add9 openssl is a required extension (OAuth and OStatus) 2014-11-19 14:53:51 +01:00
Mikael Nordfeldth
75b8123dbf Updated prerequisite list for PHP5.4
Also added distribution specific notes.

The "XMLWriter" PECL extension is included by default since PHP 5.1.2
2014-11-19 14:25:25 +01:00
Mikael Nordfeldth
496acdc7d9 normalizing acct: URI just to be sure 2014-11-16 18:29:05 +01:00
Mikael Nordfeldth
34f6ea1d04 Present WWW-Authenticate on failure to authenticate 2014-11-10 12:17:39 +01:00
Mikael Nordfeldth
b6a168c82e Unnecessary to check PHP_AUTH_USER here
it was implied from $this->auth_user_nickname above
2014-11-10 12:10:21 +01:00
Mikael Nordfeldth
17647dc3ff $header was always true due to previous if statement 2014-11-10 11:59:01 +01:00