nobody
a59b6399fa
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-14 21:38:16 -07:00
nobody
c1f99901f8
check sites module for blocked stuff
2021-04-14 19:19:06 -07:00
nobody
41927d89d6
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-14 17:41:53 -07:00
nobody
5828a844b6
Add site restriction checking to returned directory entries. Previously we only checked personal blocklists. Also some performance improvements on directory filtering.
2021-04-14 17:18:23 -07:00
nobody
4550d6d575
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-13 22:09:46 -07:00
nobody
a208ef43cc
wrong array
2021-04-13 22:08:41 -07:00
nobody
2aa84260cc
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-13 21:21:54 -07:00
nobody
db7cdca177
parse issue
2021-04-13 21:20:43 -07:00
nobody
6e484c73c9
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-13 21:13:33 -07:00
nobody
a110783fe9
comment control issues
2021-04-13 21:07:24 -07:00
nobody
0985428607
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-13 20:18:00 -07:00
nobody
7b6e1acbde
unbalanced parens
2021-04-13 20:17:06 -07:00
nobody
982d3b5e5b
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-13 20:12:50 -07:00
nobody
bd298f4165
"active" setting for directory searches
2021-04-13 20:11:33 -07:00
nobody
b4d755f8ab
provide "updated only" setting on directory searches which limits to entries that have been updated in < 60 days
2021-04-13 19:03:27 -07:00
nobody
112a3463c1
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-13 18:46:54 -07:00
nobody
df781212d4
propagate item comment settings to local children. This serves no practical purpose other than data consistency since we only check comment permissions against the parent item.
2021-04-13 18:35:07 -07:00
nobody
ef8978be6c
issues with comment control
2021-04-13 18:12:15 -07:00
nobody
32d03a825d
onepoll: improvements in fetching outbox content
2021-04-12 22:37:08 -07:00
nobody
0f62a46844
cleanup
2021-04-12 20:49:58 -07:00
nobody
f3079addde
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-12 18:39:27 -07:00
nobody
1a4a46db6d
summon requires array
2021-04-12 18:32:44 -07:00
nobody
8de94d04c2
missing line from other test server
2021-04-12 18:22:59 -07:00
nobody
36d5aec5f4
debugging queued collection fetches
2021-04-12 18:19:27 -07:00
nobody
3fca2da820
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-11 19:35:26 -07:00
nobody
5fa03c416c
not enough levels of array
2021-04-11 19:20:28 -07:00
nobody
31c46fdb13
prevent looping on the sync packet
2021-04-11 19:13:36 -07:00
nobody
391668049a
more cleanup
2021-04-11 18:28:11 -07:00
nobody
64ed1be4e1
cleanup after tests
2021-04-11 18:13:41 -07:00
nobody
f8b7cb33d5
use network type 'token' for atoken xchans
2021-04-11 17:55:54 -07:00
nobody
1b79f1f885
cleanup
2021-04-10 23:39:04 -07:00
nobody
d21f3ef61f
abook uses 'entry_deleted' instead of just 'deleted' to detect deletions in sync packets
2021-04-10 20:36:03 -07:00
nobody
fa57e701d2
edge cases syncing atokens
2021-04-10 20:15:55 -07:00
nobody
d9d4a47dbb
clone atokens and their associated structures
2021-04-10 18:41:35 -07:00
nobody
06d70288ef
porting access tokens and making them generally more useful by adding them to connections
2021-04-10 15:32:14 -07:00
nobody
7aee418044
some oauth work necessary for AP C2S. This appears to be heading down the path of favouritism towards oauth2 and deprecating openid connect. In theory we should be able to support both, but the underlying library isn't quite as flexible as hoped and appears to favour one or the other without involving multiple installations.
2021-04-10 00:51:12 -07:00
nobody
456ea265bc
provide option to block/ignore reshared content from any individual connection
2021-04-07 23:22:10 -07:00
nobody
1300d9097b
remove the btlogger now that this situation is resolved
2021-04-07 21:52:34 -07:00
nobody
89d2c293e7
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-07 19:13:13 -07:00
nobody
38c2f8666b
allow setting the UA string for fetches
2021-04-07 19:11:55 -07:00
nobody
486197c88e
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-07 18:03:38 -07:00
nobody
64f3490839
comments
2021-04-06 21:03:47 -07:00
nobody
965430bd70
very slow progress on AP C2S API
2021-04-06 20:33:27 -07:00
nobody
ee99f8f27f
issue commenting from search/display if you're the site admin
2021-04-06 19:49:44 -07:00
nobody
b48a70641e
refactor the content search algorithm slightly to return public results if there are no results owned by the logged in channel.
2021-04-06 17:05:00 -07:00
nobody
136066b971
federated alt text support for image attachments
2021-04-06 13:31:44 -07:00
nobody
cbbe280fe8
undo replyto infrastructure until I can test further
2021-04-05 22:36:32 -07:00
nobody
9c4c7524a9
revision
2021-04-05 19:23:04 -07:00
nobody
49849ec811
Merge branch 'dev' of ../p3 into dev
2021-04-05 19:22:02 -07:00
nobody
038b1cbe06
fetch collections
2021-04-05 19:21:28 -07:00
nobody
be749373a9
looks like Keyutils::convert_salmon_key was renamed
2021-04-05 18:42:01 -07:00
nobody
598d6cbc00
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-05 18:04:08 -07:00
nobody
5edf428930
don't show draft threads in the drafts display if your draft comment was deleted but not yet wiped from disk.
2021-04-05 18:02:19 -07:00
nobody
6338fe995b
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-05 17:58:30 -07:00
nobody
f4b131a00a
issue displaying draft comments on stream page
2021-04-05 17:57:39 -07:00
nobody
3a73d2ffbf
allow collections in navbar ActivityStreams search, but restrict number of items imported to 10 in order to avoid memory exhaustion. There is a plan to provide an extension to the import module in the future to import complete or at least much larger collections; which may require disabling automatic conversation completion or running as a background task.
2021-04-04 20:18:28 -07:00
nobody
886c7337df
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-01 17:04:24 -07:00
nobody
26eb01dc39
Merge branch 'dev' of ../p3 into dev
2021-04-01 15:23:12 -07:00
nobody
d24b9a9544
disable file activities until a few more things are fixed.
2021-04-01 15:21:19 -07:00
nobody
bbc466c7a8
Merge branch 'dev' of /home/macgirvin/z into dev
2021-04-01 14:47:39 -07:00
nobody
eb8db87fe6
issue with siteinfo
2021-04-01 14:46:50 -07:00
nobody
a125379844
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-31 18:30:58 -07:00
nobody
34d7b074ae
more work on AP fetchable photo albums
2021-03-31 18:25:14 -07:00
nobody
dcba7dc613
initial work on supporting activitypub fetchable photo albums (and eventually file collections)
2021-03-31 17:22:47 -07:00
nobody
8dcdba5f40
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-29 19:28:36 -07:00
nobody
2e372e5901
activitypub "public" detection improvements, per the spec section 5.6
2021-03-29 18:47:39 -07:00
nobody
471accbcc1
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-28 15:58:23 -07:00
nobody
6457e67417
use phpseclib (yuk)
2021-03-28 15:37:49 -07:00
nobody
85fd544334
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-28 12:16:14 -07:00
nobody
55a5e03c9b
allow acl changes on drafts
2021-03-28 12:14:47 -07:00
nobody
94fa0cb111
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-27 14:54:38 -07:00
nobody
82ffc326fb
wrong variable name
2021-03-27 14:53:17 -07:00
nobody
153ccca230
wip: dm links, possibly requires significant refactor of the acl_selector before all is said and done
2021-03-25 20:29:42 -07:00
nobody
866182aaaa
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-23 20:52:01 -07:00
nobody
ce67fdb790
issue syncing photos of non-zero imgscale
2021-03-23 20:50:41 -07:00
nobody
0f64263315
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-21 22:34:18 -07:00
nobody
28f500e93e
strings and stuff
2021-03-21 22:33:52 -07:00
nobody
5e4d7d15a1
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-21 22:01:51 -07:00
nobody
e38fb2de29
use multicode by default
2021-03-21 21:56:18 -07:00
nobody
47246212f4
don't search mastodon urls as actors if AP fetch failed. Change to wording of expire setting.
2021-03-21 17:44:24 -07:00
nobody
1ba4e50bc7
more nomadic content
2021-03-18 18:53:29 -07:00
nobody
a90d957bef
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-17 22:41:31 -07:00
nobody
b87d7975d0
subtle issues encountered with item sync
2021-03-17 21:21:48 -07:00
nobody
e9584aff10
remove accounts that do not complete email verification in 3 days
2021-03-17 18:30:37 -07:00
nobody
79c1d7f5cf
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-16 20:07:16 -07:00
nobody
e74c0e2f90
cleanup
2021-03-16 20:06:35 -07:00
nobody
0b08169eb2
initial exploration into the next generation of access tokens. First make the old system work again.
2021-03-16 18:59:56 -07:00
nobody
8510a0eb3b
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-15 16:58:14 -07:00
nobody
6fbd31cbc3
start the next push; also try to work around multiple zot hublocs from sites that were over-written and started fresh with the same username
2021-03-15 16:56:03 -07:00
nobody
62863f2aed
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-14 22:13:41 -07:00
nobody
6589475b26
Merge branch 'dev' of ../p3 into dev
2021-03-14 22:12:39 -07:00
nobody
d69589e17e
scripted replace of 'array()' with '[]'
2021-03-14 22:10:44 -07:00
nobody
9555085589
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-14 21:37:28 -07:00
nobody
730c386cd8
search actor url from navbar
2021-03-14 16:41:45 -07:00
nobody
7b9d245841
search actor urls
2021-03-14 16:04:13 -07:00
nobody
b431f938b8
whitespace
2021-03-13 23:14:32 -08:00
nobody
c1282570df
catch two more places where follow|unfollow->note could leak.
2021-03-13 15:40:35 -08:00
nobody
3d91ecbe82
include follow
2021-03-13 14:42:19 -08:00
nobody
f30e71038d
notifier: reject unfollow activities, which are internal use only and should not be forwarded
2021-03-13 14:03:27 -08:00
nobody
4b8dc7aaaa
don't accept confederated Unfollow
2021-03-13 12:35:22 -08:00
nobody
c9b2cab67f
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-12 14:39:06 -08:00
nobody
169dae482a
typo
2021-03-12 14:37:18 -08:00
nobody
e85dcd6f11
Merge branch 'dev' of ../p3 into dev
2021-03-12 14:27:31 -08:00
nobody
073db32fe1
minor tweaks (php8 cont.)
2021-03-12 14:26:56 -08:00
nobody
19680626e6
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-12 12:37:52 -08:00
nobody
9088d135b6
improve connedit: refresh photo on ap
2021-03-12 12:37:11 -08:00
nobody
96f99cc4cd
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-11 20:40:35 -08:00
nobody
2f3a618eb5
bugfixes after php8 fixes
2021-03-11 20:36:42 -08:00
nobody
2b289594db
php8 cont.
2021-03-11 20:00:59 -08:00
nobody
f6428e2b60
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-11 18:05:27 -08:00
nobody
5a60f55023
more php8
2021-03-11 17:17:40 -08:00
nobody
988f223ca3
yet more php8
2021-03-11 17:09:22 -08:00
nobody
3b67277ff8
even more php8 stuff
2021-03-11 16:03:45 -08:00
nobody
6feff1b31c
changes being tested
2021-03-11 15:05:16 -08:00
nobody
61e67412e7
incorrect array elements used to store first zot6 xchan for a channel
2021-03-11 02:46:39 -08:00
nobody
157aca4c3b
php8 cont.
2021-03-10 21:31:13 -08:00
nobody
2415b55567
php8 cont.
2021-03-10 19:46:10 -08:00
nobody
f1a1aafbcb
more php8
2021-03-10 19:30:25 -08:00
nobody
7ef8ffb5e3
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-10 18:06:05 -08:00
nobody
e190f23f24
php8 cont.
2021-03-10 16:51:42 -08:00
nobody
7c71e0b94a
php8 cont.
2021-03-10 15:28:37 -08:00
nobody
5d07b426e7
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-09 19:18:14 -08:00
nobody
520e0c78c4
missed logging the reason for a rejected pubstream activity (in this case it was sent as "unlisted" from ActivityPub software which provides that option)
2021-03-09 17:10:28 -08:00
nobody
ac431016a1
php8 cont.
2021-03-09 16:08:04 -08:00
nobody
59a85734a1
php8 cont.
2021-03-09 15:36:07 -08:00
nobody
49e25418c9
more php8 issues
2021-03-09 14:35:41 -08:00
nobody
d8ec492288
latest php8 issues
2021-03-09 14:12:18 -08:00
nobody
435ac66063
reverse logic
2021-03-08 18:41:29 -08:00
nobody
ad3f33d69f
php8 stuff
2021-03-08 17:51:41 -08:00
nobody
db42f49afa
some php8 updates
2021-03-08 15:36:50 -08:00
nobody
0c382f5483
begin the messy transition to multicode object source, which will ultimately fix Friendica confederation but could negatively affect Hubzilla confederation.
2021-03-07 21:32:28 -08:00
nobody
0df2af96a7
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-07 18:48:53 -08:00
nobody
45527f656b
drafts ux
2021-03-07 17:49:23 -08:00
nobody
c8033cf42a
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-07 17:00:07 -08:00
nobody
cb99667107
strpos args reversed
2021-03-07 16:59:19 -08:00
nobody
debf8b6693
comment drafts
2021-03-07 15:11:03 -08:00
nobody
1c0ce67e29
return hash on AccessList::add()
2021-03-05 14:37:41 -08:00
nobody
d132d7c303
Merge branch 'dev' of /home/macgirvin/z into dev
2021-03-01 19:28:19 -08:00
nobody
ca5c56d875
revive the help app
2021-03-01 19:14:12 -08:00
nobody
33630e9051
more doco
2021-03-01 18:50:41 -08:00
nobody
da3bd2e045
more doco infrastructure
2021-03-01 18:39:33 -08:00
nobody
8cd09e6eaa
upgrade help module to use multicode
2021-03-01 16:33:20 -08:00
nobody
d4346b7f4d
restart the docfile importer
2021-03-01 15:59:57 -08:00
nobody
9ec4a8c8a5
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-28 16:44:26 -08:00
nobody
aa556fa290
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-28 16:43:41 -08:00
nobody
11de7c31da
cleanup gprobe, update strings and version
2021-02-28 16:33:20 -08:00
nobody
be0cfe4ce5
import friendica lists/groups; probe for zot6 on activitypub actor_store to ensure it happens at all
2021-02-28 16:14:40 -08:00
nobody
65b6a41bd7
friendica import testing
2021-02-25 20:04:49 -08:00
nobody
d0a904ffe4
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-25 17:55:11 -08:00
nobody
2b75971c57
typo
2021-02-25 17:17:07 -08:00
nobody
dab065ead1
more work on Friendica import
2021-02-25 17:14:09 -08:00
nobody
c16663c67b
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-25 00:38:33 -08:00
nobody
0c4751543f
incorrect variable
2021-02-25 00:35:36 -08:00
nobody
df1d045c28
add friendica importer
2021-02-24 17:52:32 -08:00
nobody
36d7889e14
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-24 16:21:09 -08:00
nobody
111b2d61b0
more string issues
2021-02-24 15:23:10 -08:00
nobody
542dbde03c
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-24 15:17:34 -08:00
nobody
aaaab46790
plural string issue
2021-02-24 14:28:35 -08:00
nobody
5455759627
too many parameters
2021-02-23 20:01:21 -08:00
nobody
44edbcec6a
some items not appearing in mod_display when they should - iteration 498866735 or something like that
2021-02-23 19:57:59 -08:00
nobody
f67493ab32
more work on purification of complex imported objects
2021-02-23 17:40:25 -08:00
nobody
c167e1ab55
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-23 16:13:24 -08:00
nobody
414c2be024
don't try to purify an array
2021-02-23 15:22:30 -08:00
nobody
0afb443758
off by one
2021-02-23 15:09:46 -08:00
nobody
23cd74d281
Friendica-style bbcode img tags with alt text create bad attachment links
2021-02-23 15:06:59 -08:00
nobody
0c1db8c95f
Remove collection support for roadhouse.
2021-02-22 15:12:39 -08:00
nobody
0d18d08408
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-21 17:41:09 -08:00
nobody
3c99fa2056
code review
2021-02-21 17:39:48 -08:00
nobody
e0ddd04b06
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-21 16:53:29 -08:00
nobody
f2ba2fb44b
multiple attachments in body
2021-02-21 16:40:14 -08:00
nobody
07ef41ab00
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-21 15:38:08 -08:00
nobody
2a1cc06f40
fix unknown permission roles imported from hubzilla, add missing geo information to posts (and profiles) and use Mario's rendering of crypt content for alternate networks rather than leaving the bbcode intact - although I believe this may suppress the key hint and I haven't verified the availability of the algorithm.
2021-02-20 12:58:42 -08:00
nobody
c283317bac
hz compatibility stuff
2021-02-18 17:55:51 -08:00
nobody
997176fadf
migration testing
2021-02-17 19:44:31 -08:00
nobody
1e2307a9c7
I'm hesitant to merge pull request 20 for a number of reasons, but the Accept-header based module handlers have to be re-ordered in any case so the wrong one doesn't answer prematurely if a request contains more than one of Zot6 or ActivityPub in the Accept headers. So we'll do that while I'm thinking about the best way forward. This creates a policy mess because in this case AP has to have priority over Zot. Elsewhere, we always prioritise Zot first.
...
The problem will always be future developers who don't understand that the precise order of Accept-header based module handlers in the code will be critical to proper functioning if I let this go forward.
2021-02-16 19:10:47 -08:00
nobody
96c5b7b93e
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-13 14:40:51 -08:00
nobody
5da6b86ee9
some patches from upstream, plus zot fetch conversation was only checking for zot authors and missing AP authors resulting in 'author not found' even though the record existed.
2021-02-13 14:38:31 -08:00
nobody
79040deae6
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-10 17:56:12 -08:00
nobody
a86c178ccf
superblock: we need the entire xchan record, not just the url. Also prevent blocking your own site.
2021-02-10 16:06:56 -08:00
nobody
f09fcf6dda
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-10 14:06:38 -08:00
nobody
b2dd6a3dde
the connections search doesn't use regex searching so it doesn't require preg_quote() escaping
2021-02-07 20:09:10 -08:00
nobody
7dd99afd89
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-07 16:16:37 -08:00
nobody
077871ba8c
quotes are unescaped in the latest multi-code implementation and this screws up some bbcode parameter parsers that expected to see & quot ;
2021-02-07 16:13:33 -08:00
nobody
e854c21780
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-04 21:25:22 -08:00
nobody
a4fc6173b9
make sure $txt exists also
2021-02-04 21:24:27 -08:00
nobody
10a3b33dac
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-04 20:39:57 -08:00
nobody
b19133800c
testing outbound mention rewrites
2021-02-04 20:35:51 -08:00
nobody
ceb19ae475
Merge branch 'dev' of ../p3 into dev
2021-02-04 17:42:24 -08:00
nobody
b9f8585341
Attempt to force mentions to use the default mention rewrite conventions for the network involved (e.g. username vs. displayname). This will only work for original activities, not relayed activities which need to have been signed by the sender and therefore cannot be modified.
2021-02-04 16:35:18 -08:00
nobody
ffcfdf37fe
use bbonly flag when regenerating cache
2021-02-04 16:09:59 -08:00
nobody
a22ee64fe5
Merge branch 'dev' of /home/macgirvin/z into dev
2021-02-04 15:35:16 -08:00
nobody
7fc04b2168
apply escape flag to incoming zot6 content
2021-02-04 15:33:51 -08:00
nobody
f42be75870
updates
2021-02-03 18:07:23 -08:00
nobody
99b5660dfd
issue #14
2021-01-29 12:09:44 -08:00
nobody
09258c4517
set site_update on AP fetches so that immediate delivery is deferred less often
2021-01-28 16:47:01 -08:00
nobody
ac67f255f5
logging improvements
2021-01-28 13:59:53 -08:00
nobody
1c3c9ceeb9
Provide infrastructure for porting queueworker addon and fix some nasty queueworker bugs
2021-01-27 20:55:55 -08:00
nobody
0922aacf45
code comments
2021-01-27 15:43:54 -08:00
nobody
6cf4374cc6
fetch_parents logging enhancements and re-working of purge_all activity
2021-01-26 17:03:43 -08:00
nobody
bb74e1cdda
typos
2021-01-26 15:01:22 -08:00