Commit Graph

24993 Commits

Author SHA1 Message Date
Marie c491385f2e
merge: fix file sorting on user notes (#122) 2023-10-31 18:11:24 +01:00
dakkar 044d3d76e7 actually fix #118
`note.fileIds` is an array, it's always going to be truthy; we need to
check the length, like a similar `if` does just a few lines above
2023-10-31 16:16:39 +00:00
dakkar 111863b396 try to fix #118
when fetching notes from Redis, we need to re-check the criteria from
the API request, because `userTimelineWithFiles`,
`userTimelineWithReplies`, `userTimelineWithChannel` all get merged
together, so `noteIds` may well contain notes without attachments…
2023-10-31 15:18:37 +00:00
dependabot[bot] 9de6e0ac48
Merge pull request #121 from transfem-org/dependabot/github_actions/awalsh128/cache-apt-pkgs-action-1.3.1 2023-10-31 13:04:21 +00:00
dependabot[bot] eb71b283ab
chore(deps): bump awalsh128/cache-apt-pkgs-action from 1.3.0 to 1.3.1
Bumps [awalsh128/cache-apt-pkgs-action](https://github.com/awalsh128/cache-apt-pkgs-action) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/awalsh128/cache-apt-pkgs-action/releases)
- [Commits](https://github.com/awalsh128/cache-apt-pkgs-action/compare/v1.3.0...v1.3.1)

---
updated-dependencies:
- dependency-name: awalsh128/cache-apt-pkgs-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 12:53:43 +00:00
Marie 20ec6300f5
merge: mastodon api changes (#120) 2023-10-31 12:31:48 +01:00
Mar0xy b57b644ec6
chore: remove console log on verify_credentials 2023-10-31 12:13:37 +01:00
Mar0xy 6673c7fc13
fix: limit query being returned as string instead of int 2023-10-31 12:06:47 +01:00
Mar0xy c18efe0042
upd: add empty return on trends/links 2023-10-31 11:49:34 +01:00
Mar0xy 98389114a8
fix: suggestions 2023-10-31 11:46:08 +01:00
Mar0xy 171ba6f4f5
chore: change style of getStatusTrends 2023-10-31 11:38:23 +01:00
Mar0xy 0a9ca195e2
fix: create trends/tags endpoint 2023-10-31 11:34:25 +01:00
Mar0xy d15c588080
upd: change handling of suggestions and status trends 2023-10-31 11:31:31 +01:00
Mar0xy 20a8bb0467
fix: search being broken on dev through mastodon 2023-10-30 13:09:20 +01:00
Mar0xy 4fa15f27c7
fix: deleting a list returning an error as success 2023-10-30 13:00:58 +01:00
Mar0xy 46bb5f2dac
fix: lists not being received properly 2023-10-30 12:53:28 +01:00
Mar0xy e24a57402b
chore: lint 2023-10-30 01:47:24 +01:00
Mar0xy 81def9457b
upd: allow updating of fields 2023-10-30 01:32:48 +01:00
Mar0xy c88fbe843a
upd: remove debug lines, fix header not being detected 2023-10-30 01:04:55 +01:00
Mar0xy d942d4d0d0
upd: change resolving of _request.files 2023-10-30 00:57:12 +01:00
Mar0xy be7d3859c3
test: update debug lines 2023-10-30 00:45:38 +01:00
Mar0xy e8e4bafa64
upd: remove host lookup on file updating 2023-10-30 00:34:19 +01:00
Mar0xy 2aa7c1ae34
upd: remove Bearer from auth when looking up token 2023-10-30 00:29:58 +01:00
Mar0xy b57ec5e2eb
test: avatar and header uploading 2023-10-30 00:27:04 +01:00
Mar0xy 8736560e5f
fix: reply edits not staying attached 2023-10-29 21:51:12 +01:00
Mar0xy cd1083cc30
fix: relationships not working on some clients 2023-10-29 14:31:26 +01:00
dependabot[bot] 32e877f075
Merge pull request #115 from transfem-org/dependabot/github_actions/actions/setup-node-4 2023-10-29 12:07:58 +00:00
Mar0xy b596a4978f
upd: add quoteUri resolving and correct reblog/quote handling 2023-10-29 12:49:41 +01:00
Mar0xy c53323d237
upd: add history endpoint, make sure all areas use new convertAccount 2023-10-29 12:18:18 +01:00
Mar0xy 8fd669ff7d
fix: statuses using wrong emojis 2023-10-29 03:30:35 +01:00
Mar0xy d8b0078ffa
fix: emojis not loading on local statuses 2023-10-29 03:23:09 +01:00
Mar0xy 549bcf70db
upd: convertAccount now fetches info from the DB 2023-10-29 02:59:36 +01:00
Mar0xy 95bcfd8ef3
fix: followers and following not being able to load 2023-10-29 02:23:43 +02:00
Mar0xy 90b666e626
fix: await all results on favourites and reblogged 2023-10-29 02:20:05 +02:00
Mar0xy 43f27a639f
upd: simplify importing of mastoconverter, fix bug
Lets you import stuff into mastoconverter without needing to also import them everywhere else
Fixes not being able to get statuses on accounts
2023-10-29 02:06:19 +02:00
Mar0xy f92773d995
fix: lockfile 2023-10-29 01:00:54 +02:00
Mar0xy 82c10de265
upd: change deps, fix a few bugs, update converter
Fixes User and Notes count bug (transfem-org/Sharkey#113)
Fixes build issues due to types (transfem-org/Sharkey#111)
Return accounts and notes like Iceshrimp
Use MFM class from Iceshrimp to fix HTML output for mastodon
2023-10-29 00:50:00 +02:00
dependabot[bot] 71b6fffdcf
chore(deps): bump actions/setup-node from 3 to 4
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-24 13:05:03 +00:00
Mar0xy b0a7fd6ddb
Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop 2023-10-22 22:48:58 +02:00
Mar0xy 13c5da63d7
fix: MFM overflowing out of note
Closes transfem-org/Sharkey#104
2023-10-22 22:48:49 +02:00
Marie 38412eef18
merge: partially un-hash CSS class names (#109) 2023-10-22 19:51:38 +02:00
ShittyKopper 4a4fd70180 upd: partially un-hash CSS class names
intended to allow easier creation of custom CSS modifications. the last
4 chars of class names should be static as long as files don't move, but
just in case modifications might prefer to use prefix selectors such as
[class^=MkWhatever] instead of .MkWhatever-1234
2023-10-22 20:39:38 +03:00
Mar0xy 6d290225ef
fix: not checking for renotes during packing of note
Closes transfem-org/Sharkey#108
2023-10-22 19:20:06 +02:00
Mar0xy d49099baeb
upd: add additional checks 2023-10-22 19:19:44 +02:00
Marie b43402519f
merge: nicer file type search (#107) 2023-10-22 14:46:39 +02:00
Mar0xy 16f671c0f4
Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop 2023-10-22 14:43:31 +02:00
dakkar 1dc5623713 use block comment 2023-10-22 13:43:19 +01:00
Mar0xy 7c922dc39b
fix: wakelock error causing site to not load 2023-10-22 14:43:15 +02:00
dakkar b74fd71d67 nicer file type search
* the previous one could allow a SQL injection, since the
  `opts.filetype` value came straight from the browser

* this more precise regex match will not produce spurious
  matches (which were very unlikely, true, but still, let's be
  precise) (`video/movingimages` would have matched `%image%`!)
2023-10-22 13:35:11 +01:00
Amelia Yukii aaf55cf937
revert: atempt pull to reload 2023-10-22 14:14:02 +02:00