From 0c2b1f7e98e2e83655b68f41bef9c028989c2423 Mon Sep 17 00:00:00 2001 From: foss- Date: Tue, 12 Jan 2021 14:50:56 +0100 Subject: [PATCH 1/8] updated contac states - added sub-headlines for better readibility - rephrased to match new format --- doc/FAQ.md | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index 11954e46f3..de2ea05439 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -94,26 +94,25 @@ in German: When a certain language is forced, the language remains until session is closed. -### What is the difference between blocked|ignored|archived|hidden contacts? +### What is the difference between blocked, ignored, archived and hidden contacts? -We prevent direct communication with **blocked contacts**. -They are not included in delivery, and their own posts to you are not imported. -However their conversations with your friends will still be visible in your stream. -If you remove a contact completely, they can send you another friend request. -Blocked contacts cannot do this. They cannot communicate with you directly, only through friends. +##### Blocked -**Ignored contacts** are included in delivery - they will receive your posts and private messages. -However we do not import their posts or private messages to you. -Like blocking, you will still see this person's comments to posts made by your friends. +Direct communication will be blocked. Blocked contacts are not included in delivery, and their own posts to you are not imported. However their conversations with your friends will still be visible in your stream. If you remove a contact completely, they can send you another friend request. Blocked contacts cannot do this. They cannot communicate with you directly, only through friends. -An addon called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including his/her conversations with your other friends. +##### Ignored -An **archived contact** means that communication is not possible and will not be attempted. -(Perhaps the person moved to a new site and removed the old profile.) -However unlike blocking, existing posts this person made before being archived will be visible in your stream. +Not included in delivery but they will receive your posts and private messages. However we do not import their posts or private messages to you. Like blocking, you will still see this person's comments to posts made by your friends. -A **hidden contact** will not be displayed in any "friend list" (except to you). -However a hidden contact will appear normally in conversations and this may expose his/her hidden status to anybody who can see the conversation. +An addon called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including their conversations with your other friends. + +##### Archieved + +Communication is not possible and will not be attempted. However unlike blocking, existing posts this person made before being archived will be visible in your stream. + +##### Hidden + +Contact not be displayed in your public friend list. However a hidden contact will appear normally in conversations and this may expose their hidden status to anybody who can see the conversation. ### What happens when an account is removed? From c2719295d2fa8e3a84a666f262aeec06b909c0d4 Mon Sep 17 00:00:00 2001 From: foss- Date: Tue, 12 Jan 2021 15:12:51 +0100 Subject: [PATCH 2/8] FAQ: improved contact state title --- doc/FAQ.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index de2ea05439..2bd03098af 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -9,7 +9,7 @@ User * **[How can I upload images, files, links, videos and sound files to posts?](help/FAQ#upload)** * **[Is it possible to have different avatars per profile?](help/FAQ#avatars)** * **[How can I view Friendica in a certain language?](help/FAQ#language)** -* **[What is the difference between blocked|ignored|archived|hidden contacts?](help/FAQ#contacts)** +* **[How do blocked, ignored, archived and hidden contacts behave?](help/FAQ#contacts)** * **[What happens when an account is removed? Is it truly deleted?](help/FAQ#removed)** * **[Can I subscribe to a hashtag?](help/FAQ#hashtag)** * **[How to create a RSS feed of the stream?](help/FAQ#rss)** @@ -94,7 +94,7 @@ in German: When a certain language is forced, the language remains until session is closed. -### What is the difference between blocked, ignored, archived and hidden contacts? +### How do blocked, ignored, archived and hidden contacts behave? ##### Blocked From 7882679febd37c315095cf774fe408224b80e1e1 Mon Sep 17 00:00:00 2001 From: foss- Date: Tue, 12 Jan 2021 15:47:33 +0100 Subject: [PATCH 3/8] FAQ: Client update - remove Hotot (unmaintained / EOL) - Choqok: added link - AndStatus: added links - Mustard-Mod (removed, looks dead https://github.com/royalterra/Mustard-Android-APK) - Mustard (removed, also dead http://mustard.macno.org/ - Twidere added links - DiCa (removed, dead https://dica.mixi.cool/) - Fedilab added links - Friendiqa added links --- doc/FAQ.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index 2bd03098af..31437ec5b5 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -160,22 +160,16 @@ Friendica is using a [Twitter/GNU Social compatible API](help/api), which means Here is a list of known working clients: * Android - * [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) (available in Google Playstore or from a binary repository you can add to [F-Droid](https://freunde.ma-nic.de/display/3e98eba8185a13c5bdbf3d1539646854)) - * [Fedilab](https://fedilab.app/) (available in F-Droid and Google stores) - * [DiCa](https://dica.mixi.cool/) - * AndStatus - * Twidere - * Mustard and Mustard-Mod + * [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) ([F-Droid](https://git.friendi.ca/lubuwest/Friendiqa#install), [Google Play](https://play.google.com/store/apps/details?id=org.qtproject.friendiqa)) + * [Fedilab](https://fedilab.app/) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android)) + * AndStatus ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app)) + * Twidere ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android) * SailfishOS * [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form) * Linux - * Hotot - * Choqok -* MacOS X - * Hotot + * [Choqok](https://choqok.kde.org) * Windows - * [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) for Windows 10 - * Hotot + * [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) (Windows 10) Depending on the features of the client you might encounter some glitches in usability, like being limited in the length of your postings to 140 characters and having no access to the [permission settings](help/Groups-and-Privacy). From 7ed7392e357cceb10abce7df1fef2bd9d4f45204 Mon Sep 17 00:00:00 2001 From: foss- Date: Tue, 12 Jan 2021 15:51:45 +0100 Subject: [PATCH 4/8] FAQ: Client additional links --- doc/FAQ.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index 31437ec5b5..60ad54ba78 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -161,9 +161,9 @@ Here is a list of known working clients: * Android * [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) ([F-Droid](https://git.friendi.ca/lubuwest/Friendiqa#install), [Google Play](https://play.google.com/store/apps/details?id=org.qtproject.friendiqa)) - * [Fedilab](https://fedilab.app/) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android)) - * AndStatus ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app)) - * Twidere ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android) + * [Fedilab](https://fedilab.app) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android)) + * [AndStatus](http://andstatus.org) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app)) + * [Twidere](https://dimension.im/) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android)) * SailfishOS * [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form) * Linux From ea9eb6a8d161a8c7a36ed4713da741542fd07a16 Mon Sep 17 00:00:00 2001 From: foss- Date: Tue, 12 Jan 2021 15:54:34 +0100 Subject: [PATCH 5/8] renamed client section "List of friendica clients" not a question, but more compact and easier to process --- doc/FAQ.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index 60ad54ba78..fdf041a49c 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -13,7 +13,7 @@ User * **[What happens when an account is removed? Is it truly deleted?](help/FAQ#removed)** * **[Can I subscribe to a hashtag?](help/FAQ#hashtag)** * **[How to create a RSS feed of the stream?](help/FAQ#rss)** -* **[Are there any clients for friendica I can use?](help/FAQ#clients)** +* **[List of friendica clients](help/FAQ#clients)** * **[Where I can find help?](help/FAQ#help)** Admins @@ -154,7 +154,7 @@ Example: Friendica Support https://forum.friendi.ca/feed/helpers/comments -### Are there any clients for friendica I can use? +### List of friendica clients Friendica is using a [Twitter/GNU Social compatible API](help/api), which means you can use any Twitter/GNU Social client for your platform as long as you can change the API path in its settings. Here is a list of known working clients: From 538873e5553427285c0eefcaea79637f793a02db Mon Sep 17 00:00:00 2001 From: foss- Date: Sun, 24 Jan 2021 13:40:34 +0100 Subject: [PATCH 6/8] Update doc/FAQ.md Co-authored-by: Hypolite Petovan --- doc/FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index fdf041a49c..f7ca5b26cc 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -106,7 +106,7 @@ Not included in delivery but they will receive your posts and private messages. An addon called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including their conversations with your other friends. -##### Archieved +##### Archived Communication is not possible and will not be attempted. However unlike blocking, existing posts this person made before being archived will be visible in your stream. From 0e55675ffced3dfdc3ea5e4c44e8a973e7fb803f Mon Sep 17 00:00:00 2001 From: foss- Date: Sun, 24 Jan 2021 13:50:15 +0100 Subject: [PATCH 7/8] Update FAQ.md - revert to question format for client list - new line for each sentence as requested - corrected Ignored contacts section: they are included in delivery and will receive posts and private messages --- doc/FAQ.md | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index f7ca5b26cc..db5b7ef1f6 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -13,7 +13,7 @@ User * **[What happens when an account is removed? Is it truly deleted?](help/FAQ#removed)** * **[Can I subscribe to a hashtag?](help/FAQ#hashtag)** * **[How to create a RSS feed of the stream?](help/FAQ#rss)** -* **[List of friendica clients](help/FAQ#clients)** +* **[What friendica clients can I use?](help/FAQ#clients)** * **[Where I can find help?](help/FAQ#help)** Admins @@ -98,21 +98,29 @@ When a certain language is forced, the language remains until session is closed. ##### Blocked -Direct communication will be blocked. Blocked contacts are not included in delivery, and their own posts to you are not imported. However their conversations with your friends will still be visible in your stream. If you remove a contact completely, they can send you another friend request. Blocked contacts cannot do this. They cannot communicate with you directly, only through friends. +Direct communication will be blocked. +Blocked contacts are not included in delivery, and their own posts to you are not imported. +However their conversations with your friends will still be visible in your stream. +If you remove a contact completely, they can send you another friend request. +Blocked contacts cannot do this. They cannot communicate with you directly, only through friends. ##### Ignored -Not included in delivery but they will receive your posts and private messages. However we do not import their posts or private messages to you. Like blocking, you will still see this person's comments to posts made by your friends. +Ignored contacts are included in delivery and will receive your posts and private messages. +However we do not import their posts or private messages to you. +Like blocking you will still see this person's comments to posts made by your friends. An addon called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including their conversations with your other friends. -##### Archived +##### Archieved -Communication is not possible and will not be attempted. However unlike blocking, existing posts this person made before being archived will be visible in your stream. +Communication is not possible and will not be attempted. +However unlike blocking, existing posts this person made before being archived will be visible in your stream. ##### Hidden -Contact not be displayed in your public friend list. However a hidden contact will appear normally in conversations and this may expose their hidden status to anybody who can see the conversation. +Contact not be displayed in your public friend list. +However a hidden contact will appear normally in conversations and this may expose their hidden status to anybody who can see the conversation. ### What happens when an account is removed? @@ -154,7 +162,7 @@ Example: Friendica Support https://forum.friendi.ca/feed/helpers/comments -### List of friendica clients +### What friendica clients can I use? Friendica is using a [Twitter/GNU Social compatible API](help/api), which means you can use any Twitter/GNU Social client for your platform as long as you can change the API path in its settings. Here is a list of known working clients: From eb3ed648f8c5b86a49f934dcfd645c6fb9632ebf Mon Sep 17 00:00:00 2001 From: foss- Date: Sun, 24 Jan 2021 13:51:19 +0100 Subject: [PATCH 8/8] Update FAQ.md - Archived (typo) --- doc/FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index db5b7ef1f6..ed9d2bbc50 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -112,7 +112,7 @@ Like blocking you will still see this person's comments to posts made by your fr An addon called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including their conversations with your other friends. -##### Archieved +##### Archived Communication is not possible and will not be attempted. However unlike blocking, existing posts this person made before being archived will be visible in your stream.