Commit Graph

623 Commits

Author SHA1 Message Date
Nick Wynja 4e8f7426a4 Merge branch 'master' of https://github.com/fraction/oasis into subscribed-channels 2021-03-03 13:49:10 -05:00
Nick Wynja 398ebe9271 Adds subscribed channels to Topics
Any subscribed channels now appear at the top of Topics. This gives you
easy access to view subscribed channels using the existing hashtags
view.
2021-03-03 13:36:23 -05:00
Nick Wynja 31e5ae37d5 Hides content of messages from blocked people
This introduces a basic implementation to not display the content of
messages. It still shows that a message exists but shows localized
copy indicating why the content was hidden.

We should consider additional filters or queries in different views to actually
remove these posts but I'll leave that as up for discussion since I can see
value in showing that a blocked comment exists in a conversation.
2021-03-02 17:47:28 -05:00
Soma 519d0e55f0 fix linting issues 2021-02-13 07:33:28 -08:00
Soma c05023e0dd updating code for likes page bug 2021-02-13 07:23:26 -08:00
Christian Bundy 3530560f25
Merge pull request #585 from lindskog/iss399
Add social filter to threads
2021-01-27 07:49:11 -08:00
Cecilia Lindskog bb5dfced9b Add social filter to threads 2021-01-27 12:12:40 +01:00
Cecilia Lindskog 29dcaad89c Fix issue with feedId 2021-01-27 10:57:04 +01:00
Cecilia Lindskog 3c771da8ff Issue 126: Show recipients of private messages 2021-01-26 10:33:29 +01:00
Jose Fabio 698121813b npm run fix 2020-12-30 10:22:03 -07:00
Jose Fabio 4623c203a4 Even more translations 2020-12-30 09:52:34 -07:00
Jose Fabio 7d936f458f More translations 2020-12-29 20:19:58 -07:00
Jose Fabio b0b3900e80 Better translations for Spanish 2020-12-29 20:13:03 -07:00
Supernova 1b47d439ec Add support for linking an optional custom-style.css file from the user's oasis configuration folder. 2020-12-08 12:37:26 -05:00
Christian Bundy a02744d0eb Add rebuild button to settings
Problem: The latest release seems to have some index problems, which is
frustrating, but might be able to be circumvented with a database
rebuild. The rebuild was something that Ahau funded and I'm excited to
be able to finally expose this to users without asking them to `rm -rf`
random files in their `~/.ssb` directory.

Solution: Replaced unused 'progress' bars (always at 100%) with rebuild
button.
2020-11-29 10:55:00 -08:00
Christian Bundy 925e4bc78b Merge branch 'master' of github.com:fraction/oasis into upgrade-koa-router 2020-11-24 20:46:51 -08:00
Christian Bundy 010b4535c8
Merge pull request #524 from christianbundy/revert-css-changes
Revert CSS changes from preview PR
2020-11-24 20:04:41 -08:00
Christian Bundy 6250f4f0a4 Revert CSS changes from preview PR
Problem: There were lots of CSS changes in the preview + blob PR and I
didn't take enough time to look at them. It looks like a few of them
made style problems (e.g. extra specing in the 'next' / 'previous' links
on the profile pages) and it made it harder (IMO) to determine that
links are links (since we've been using font weight to distinguish).

Solution: Revert those changes back to the previous defaults. If the
margin glitch was on purpose or anyone feels strongly about
distinguishing links using some other style (color?) then I'm happy to
merge those, but I'd like to fix the extra margin and have *some* way to
distinguish links in the mean time.
2020-11-22 18:31:27 -08:00
Christian Bundy 70e87d5e8e Add ssb-private1
Problem: With the new ssb-db@20 we have to explicitly add ssb-private1
to ensure that we can see private messages.

Solution: Add ssb-private1 as a plugin.
2020-11-22 18:02:20 -08:00
Christian Bundy 65b7df9ea9 Remove comments to disable linters
Problem: Our tests seem to have been disabled in various places, which
means that type errors, typos, and other small problems were introduced.

Solution: Remove the comments and fix the underlying problems without
disabling the linters.
2020-11-22 16:52:12 -08:00
Christian Bundy 26fa0203a7 npm dedupe 2020-11-22 16:38:23 -08:00
Christian Bundy c86865a5ca Add more comprehensive tests
Problem: I've been worried about merging these version bump pull
requests since we don't have many tests, and I *really* don't want to
merge any catostrophic breaking changes anywhere.

Solution: Add some tests that are more comprehensive, starting by
creating a temporary SSB database and keypair and then editing the
profile, previewing a message, publishing a message, etc., until we have
a handful of small functions actually being tested. This won't ensure
that everything works forever, and it *really* doesn't test replication,
but it should help increase our confidence that test success means that
fewer things are broken.
2020-11-22 15:35:15 -08:00
Christian Bundy c993adc01a Merge flotilla source code into Oasis
Problem: I thought it would be a good idea to keep our SSB stack in
another module but it just creates friction and adds another layer to
our stack that has to be independently upgraded and versioned.

Solution: Merge the @fraction/flotilla source code into Oasis so that we
don't have to maintain two separate projects.
2020-11-22 10:10:53 -08:00
Christian Bundy 781e647fce Upgrade @koa/router
This also fixes our routes so that we're listening on `/foo` instead of
`/foo/` with an accidental trailing slash.
2020-11-21 20:15:03 -08:00
Daan Wynen 9e57b011f7
Merge pull request #469 from christianbundy/stricter-regex
Use stricter regex for @mention match
2020-11-22 00:29:10 +01:00
Christian Bundy dde991a680 Use stricter regex for @mention match
Problem: You can't publish email addresses or user@host combos or
anything like that because the regex is super liberal in what it
matches.

Solution: Ensure that the first word in a message is a mention *or*
ensure that there's whitespace before a mention. This also adds a
regex101 link (in lieu of proper testing, for now) which makes this
easier to test and track over time.

See-also: https://github.com/fraction/oasis/issues/466
2020-11-20 17:09:55 -08:00
Christian Bundy 0aacf3bbc3 Fix tests and remove workaround
Problem: Recently there was a PR [0] merged with a quickfix to avoid
some test failures, which is something I've been trying to avoid. While
`process.exit()` works fine, I'm worried that it means we don't
understand what's happening under the hood, *plus* I have the [maybe
unjustified?] worry that it might kill the process during a database
write or something dangerous. It looks like this particular test hang
was caused by both a stream and some number of intervals that were left
open.

Solution: Provide a way to close the stream and intervals in `index.js`
and ensure that we do that before closing the server.

[0]: https://github.com/fraction/oasis/pull/462
2020-11-11 08:25:38 -08:00
Alexander Cobleigh 2fc33f450d document quick fix for making the server definitively exit 2020-11-11 16:57:28 +01:00
Alexander Cobleigh e567443925 try workaround 2020-11-11 15:19:05 +01:00
Henry e7ea4dbb37 make code flow more shallow 2020-11-01 14:45:14 +01:00
Henry e3906e2230 fix race on blobs variable
fixes TypeError: Cannot read property 'startsWith' of undefined
2020-11-01 14:40:43 +01:00
Alexander Cobleigh 4d5c571df3 restore common-good check & fix its errors
after having restored the package-lock.json to that of the master branch, this
PR now uses common-good@2.0.3, which has common-good check as a command.

i ran it manually as $(npm bin)/common-good check, and fixed whatever
it complained about.
2020-10-21 15:33:01 +02:00
Alexander Cobleigh 756fd180e4 fix eslint errors 2020-10-20 13:55:52 +02:00
Alexander Cobleigh 0624aeb5fc shuffle css around to make prettier / common-good happy 2020-10-20 13:51:02 +02:00
Alexander Cobleigh e08901d88c replace warning with comment 2020-10-20 13:28:52 +02:00
Alexander Cobleigh 6220da4b52 fix button sizes 2020-10-19 10:44:52 +02:00
Henry e7dd215f4d fix common-good setup
somehow it's cli arguments changed
2020-10-19 10:06:34 +02:00
Henry 3bdca12a21 invalidate @mentions cache if the user follows someone 2020-10-19 10:06:07 +02:00
Henry c3acbc80d1 fix @mentions lookup table
with duplicates ignored switching back to a previous name doesn't work.
Imagine names [a,b,a], with duplicates ignored the query only returns [a,b].
2020-10-19 10:06:07 +02:00
Alexander Cobleigh 2f746d99e1 remove bracket from regex 2020-10-19 10:06:07 +02:00
Alexander Cobleigh ffb207ce57 add more delims, fix double nicknames 2020-10-19 10:06:07 +02:00
Henry 8f9ef5e3c7 change name->feed lookup structure
we had duplicates and _old_ names in the first attempt,
with this new strucutre only one name per feed is kept (the most recent)

also: tweak regexp some more

should not correctly match end of string and NOT match inside md link
https://regex101.com/r/Uu6iTj/3/
2020-10-19 10:06:07 +02:00
Alexander Cobleigh 28f1821fd5 improve mentions regex edge cases 2020-10-19 10:06:06 +02:00
Alexander Cobleigh 9fb2b87708 add i18n for mentions component 2020-10-19 10:06:06 +02:00
Alexander Cobleigh d4a1602940 add much improved mentions listing 2020-10-19 10:06:06 +02:00
Henry 6ea47ebac6 some more comments 2020-10-19 10:06:06 +02:00
Alexander Cobleigh a2817cf5fb implement relationship-based name matching 2020-10-19 10:06:06 +02:00
Henry d1e68e94a7 some prefix matching logic
lowercase the searches and see if they match the beginning of a name.
2020-10-19 10:06:06 +02:00
Alexander Cobleigh 632d23cfae add german translations (thx cryptix) 2020-10-19 10:06:06 +02:00
Alexander Cobleigh 8127008ce4 add i18n.preview for all languages except .de, improve labels 2020-10-19 10:06:06 +02:00