Commit graph

13942 commits

Author SHA1 Message Date
Alex Gleason
1c622c2faa Merge branch 'bundle-fe' into 'develop'
Bundle Soapbox FE, fixes #5

Closes #5

See merge request soapbox-pub/soapbox!16
2021-05-08 00:17:38 +00:00
Alex Gleason
d8954edf39
Bundle Soapbox FE, fixes #5 2021-05-07 19:02:26 -05:00
faried nawaz
5be9d13981
a better query to delete from hashtags
old query:

Delete on hashtags  (cost=5089.81..5521.63 rows=6160 width=18)
   ->  Hash Semi Join  (cost=5089.81..5521.63 rows=6160 width=18)
         Hash Cond: (hashtags.id = ht.id)
         ->  Seq Scan on hashtags  (cost=0.00..317.28 rows=17528 width=14)
         ->  Hash  (cost=5012.81..5012.81 rows=6160 width=20)
               ->  Merge Anti Join  (cost=0.70..5012.81 rows=6160 width=20)
                     Merge Cond: (ht.id = hto.hashtag_id)
                     ->  Index Scan using hashtags_pkey on hashtags ht  (cost=0.29..610.53 rows=17528 width=14)
                     ->  Index Scan using hashtags_objects_pkey on hashtags_objects hto  (cost=0.42..3506.48 rows=68158 width=14)

new query:

Delete on hashtags ht  (cost=0.70..5012.81 rows=6160 width=12)
   ->  Merge Anti Join  (cost=0.70..5012.81 rows=6160 width=12)
         Merge Cond: (ht.id = hto.hashtag_id)
         ->  Index Scan using hashtags_pkey on hashtags ht  (cost=0.29..610.53 rows=17528 width=14)
         ->  Index Scan using hashtags_objects_pkey on hashtags_objects hto  (cost=0.42..3506.48 rows=68158 width=14)
2021-05-08 02:00:43 +05:00
faried nawaz
a0c9a2b4cc
mix prune_objects: remove unused hashtags after pruning remote objects 2021-05-08 02:00:42 +05:00
faried nawaz
22b2451edd
migration: add on_delete: :delete_all to hashtags object_id fk 2021-05-08 02:00:34 +05:00
Alex Gleason
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak 2021-05-07 12:40:45 -05:00
Alex Gleason
625642f297 Merge branch 'changelog-links' into 'develop'
CHANGELOG_soapbox: add links to MRs

See merge request soapbox-pub/soapbox!15
2021-05-05 20:35:15 +00:00
Alex Gleason
58d50f58b1
CHANGELOG_soapbox: add links to MRs 2021-05-05 15:22:14 -05:00
Alex Gleason
9fc07ecbbd Merge branch 'notice-routes' into 'develop'
Add notice compatibility routes for other frontends

See merge request soapbox-pub/soapbox!14
2021-05-05 20:03:30 +00:00
Alex Gleason
838446ddf6
CHANGELOG_soapbox: notice routes 2021-05-05 14:50:34 -05:00
Alex Gleason
6614b52a17
Merge remote-tracking branch 'origin/develop' into notice-routes 2021-05-05 14:50:30 -05:00
Alex Gleason
50e3750758
Add notice compatibility routes for other frontends
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785
2021-05-05 14:50:10 -05:00
Alex Gleason
3c69941a09 Merge branch 'rich-media-redux' into 'develop'
Rich media embeds

See merge request soapbox-pub/soapbox!13
2021-05-05 19:44:01 +00:00
Alex Gleason
887ecf32b6
CHANGELOG_soapbox: rich media embeds 2021-05-05 12:39:07 -05:00
Alex Gleason
b00d3bafa6
Merge remote-tracking branch 'origin/develop' into rich-media-redux 2021-05-05 12:38:58 -05:00
Alex Gleason
9fbea2df6e
Fall back to OEmbed "url" for Photo types 2021-05-05 12:38:43 -05:00
Alex Gleason
0ebf3b3afd
Add rich type back but sanitize HTML better 2021-05-04 19:27:16 -05:00
Alex Gleason
d2260bde45
Reject "rich" type embeds for now 2021-05-04 18:53:22 -05:00
Alex Gleason
8b9ff5dab2
Sanitize rich media HTML 2021-05-04 18:29:25 -05:00
Alex Gleason
3a4ad366d5
Fix existing tests 2021-05-04 18:21:43 -05:00
Alex Gleason
0afa091e6c
Fix MastodonAPI.StatusViewTest 2021-05-04 17:46:42 -05:00
Alex Gleason
e1996d7b96
Fix RichMedia.HelpersTest 2021-05-04 17:18:20 -05:00
Alex Gleason
359c1d9f1f
Fix ParserTest 2021-05-04 17:13:28 -05:00
Alex Gleason
6b2fa5f0bb
Let :oembed_providers_enabled be configurable 2021-05-04 16:28:14 -05:00
Alex Gleason
8e2ff7669a
Add Parser.CardTest 2021-05-04 16:16:42 -05:00
Alex Gleason
95196fb5ac
Handle invalid cards 2021-05-04 15:54:24 -05:00
Alex Gleason
ebeb9c6bc9
Refactor rich media parser to store %Embed{} instead of %Card{} 2021-05-04 15:42:24 -05:00
Alex Gleason
8c4599c1dd
Fix TwitterCard tests 2021-05-04 14:15:41 -05:00
Alex Gleason
63af654688
Update TwitterCard tests and add Parser.MetaTags 2021-05-04 13:32:31 -05:00
Alex Gleason
b045dc6058
Make OEmbed discovery work 2021-05-04 11:06:10 -05:00
feld
745375bdcf Merge branch 'dont-crash-email-settings' into 'develop'
Don't crash so hard when email settings are invalid

Closes #2606

See merge request pleroma/pleroma!3400
2021-05-04 13:30:00 +00:00
feld
d5263bfcf3 Merge branch 'earmark' into 'develop'
Upgrade Earmark to v1.4.15

Closes #1942 and #2026

See merge request pleroma/pleroma!3076
2021-05-04 13:29:14 +00:00
Alex Gleason
765bdfca7d
Get basic embed working 2021-05-04 02:24:30 -05:00
Alex Gleason
c3a00e1ad2 Merge branch 'dont-crash-email-settings' into 'develop'
Don't crash when email settings are invalid

Closes #4

See merge request soapbox-pub/soapbox!12
2021-05-03 20:22:21 +00:00
Alex Gleason
5614fc7e69
CHANGELOG_soapbox: invalid email settings crash fix 2021-05-03 14:45:02 -05:00
Alex Gleason
fc3af26898
Merge remote-tracking branch 'origin/develop' into dont-crash-email-settings 2021-05-03 14:44:51 -05:00
Alex Gleason
90770e0841
CHANGELOG: don't crash so hard when email settings are invalid 2021-05-03 14:43:34 -05:00
Alex Gleason
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings 2021-05-03 14:43:28 -05:00
Alex Gleason
c80b1aaf51
Don't crash when email settings are invalid
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
2021-05-03 14:43:14 -05:00
Alex Gleason
dca87c5e7b
CHANGELOG: markdown 2021-05-01 11:28:06 -05:00
Alex Gleason
447322ecf5
Add README warning 2021-04-30 17:27:40 -05:00
Alex Gleason
1d0d5a8963 Merge branch 'simplepolicy-announce-leak' into 'develop'
Fix reposts leaking through from blocked domains

See merge request soapbox-pub/soapbox!11
2021-04-30 19:56:33 +00:00
Alex Gleason
64c6dd27b9
Merge remote-tracking branch 'origin/develop' into simplepolicy-announce-leak 2021-04-30 14:44:14 -05:00
Alex Gleason
fe7e03e6dc Merge branch 'earmark' into 'develop'
Upgrade Earmark to 1.4.15

See merge request soapbox-pub/soapbox!10
2021-04-30 19:40:50 +00:00
Alex Gleason
fd07fb9a73
CHANGELOG: fixed reposts in domain blocks 2021-04-30 14:30:25 -05:00
Alex Gleason
ea1f72c751
Merge commit 'c16c7fdb8794df8558cf8fbe4231d8f9ec01bb6d' into simplepolicy-announce-leak 2021-04-30 14:27:32 -05:00
Alex Gleason
20878c7f99
CHANGELOG: SimplePolicy embedded objects are now checked 2021-04-30 14:22:02 -05:00
Alex Gleason
926a233cc4
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak 2021-04-30 14:21:17 -05:00
Alex Gleason
c16c7fdb87
SimplePolicy: filter string Objects 2021-04-30 14:20:54 -05:00
Alex Gleason
3d742c3c1a
SimplePolicy: filter nested objects 2021-04-30 14:20:37 -05:00