Merge pull request #415 from DarkKirb/update-emoji-and-credit
add volpeon-floof and rosahaj prideflags
This commit is contained in:
commit
3e52379b59
5 changed files with 42 additions and 14 deletions
|
@ -6,8 +6,7 @@
|
|||
dissemination of any Nazi symbolism and ideology, except for education, reporting on past or current events, and
|
||||
antifascist art.</li>
|
||||
<li>Please add content description to all media that you post. This instance automatically adds a CW if it is missing.
|
||||
If you are unable to create one, you can request one via the <a
|
||||
href="https://akko.chir.rs/tag/DescriptionWanted">#DescriptionWanted</a> hashtag</li>
|
||||
If you are unable to create one, you can request one via the <a href="https://akko.chir.rs/tag/DescriptionWanted">#DescriptionWanted</a> hashtag</li>
|
||||
<li>Be considerate. Add content warnings for NSFW Content, common phobias, overly long posts, controversial subjects,
|
||||
etc. Please try to avoid flashing images and quickly moving text inside of your posts.</li>
|
||||
<li>NSFW content is generally allowed, but all NSFW content must be properly marked as such, including kinks. Profile
|
||||
|
@ -42,7 +41,7 @@ We collect the following data:
|
|||
|
||||
<h3>How do we collect your data?</h3>
|
||||
|
||||
If you are a user of this instance, we collect and process your data when you sign up for or use interactive features (e.g. Posting) of the Website.<br/>
|
||||
If you are a user of this instance, we collect and process your data when you sign up for or use interactive features (e.g. Posting) of the Website.<br />
|
||||
|
||||
If you are not a local user, we collect your data over the following ways:
|
||||
|
||||
|
@ -72,34 +71,34 @@ As members of the <a href="https://relay.awoo.today/">awoo.today relay</a>, we w
|
|||
<h3>How do we store your data?</h3>
|
||||
|
||||
We store your post, profile and account data securely in the Hetzner Datacenter in Falkenstein, Germany. <a href="https://www.hetzner.com/unternehmen/zertifizierung">See their DIN ISO/IEC 27001 certification</a>
|
||||
Media is stored on Backblaze B2<br/>
|
||||
Media is stored on Backblaze B2<br />
|
||||
|
||||
We employ technical security measures to avoid exposure to sensitive data.<br/>
|
||||
We employ technical security measures to avoid exposure to sensitive data.<br />
|
||||
|
||||
We also store backups of post, profile, and account data in multiple locations, in an encrypted form, on our server near Chemnitz, Germany, as well as on Backblaze B2.<br/>
|
||||
We also store backups of post, profile, and account data in multiple locations, in an encrypted form, on our server near Chemnitz, Germany, as well as on Backblaze B2.<br />
|
||||
For technical reasons it is not possible modify these backups to remove your data. If this is a concern, please contact us.
|
||||
|
||||
<h3>What are your data protection rights?</h3>
|
||||
|
||||
We want to make sure that you are aware of your data protection rights. Every user is entitled to the following: <br/>
|
||||
We want to make sure that you are aware of your data protection rights. Every user is entitled to the following: <br />
|
||||
|
||||
<b>The right to access</b> — You can request a copy of the data we have about you. This may require a short verification for remote users. Local users can do so in the settings under Export/Import <br/>
|
||||
<b>The right to access</b> — You can request a copy of the data we have about you. This may require a short verification for remote users. Local users can do so in the settings under Export/Import <br />
|
||||
|
||||
<b>The right to rectification</b> — You can request us to correct any information you believe is inaccurate. You also have the right to request us to complete the information you believe is inaccurate. <br/>
|
||||
<b>The right to rectification</b> — You can request us to correct any information you believe is inaccurate. You also have the right to request us to complete the information you believe is inaccurate. <br />
|
||||
|
||||
<b>The right to erasure</b> — You can request us to erase the data we have about you.<br/>
|
||||
<b>The right to erasure</b> — You can request us to erase the data we have about you.<br />
|
||||
|
||||
<b>The right to restrict to processing</b> — You can restrict us from transmitting your posts to other servers by setting your post visiblity to “Local”. Remote users can also restrict processing of certain posts, by setting its visiblity to “Unlisted” or “Private”.<br/>
|
||||
<b>The right to restrict to processing</b> — You can restrict us from transmitting your posts to other servers by setting your post visiblity to “Local”. Remote users can also restrict processing of certain posts, by setting its visiblity to “Unlisted” or “Private”.<br />
|
||||
|
||||
<b>The right to object to processing</b> — As a remote user, you can object to further processing of posts and profile data by blocking this domain.<br/>
|
||||
<b>The right to object to processing</b> — As a remote user, you can object to further processing of posts and profile data by blocking this domain.<br />
|
||||
|
||||
<b>The right to data portability</b> — You can at any point move to other instances. Due to technical restrictions, it is currently not possible to automatically transfer the users you follow and posts to your new account.<br/>
|
||||
<b>The right to data portability</b> — You can at any point move to other instances. Due to technical restrictions, it is currently not possible to automatically transfer the users you follow and posts to your new account.<br />
|
||||
|
||||
If you make a request, we have one month to respond to you. If you would like to exercise any of these rights, or need help with the included tools, please contact us at our email <a href="mailto:privacy@chir.rs">privacy@chir.rs</a>
|
||||
|
||||
<h3>Cookies</h3>
|
||||
|
||||
Cookies are text files placed on your computer to collect standard Internet log information and visitor behavior information. When you visit our websites, we may collect information from you automatically through cookies or similar technology<br/>
|
||||
Cookies are text files placed on your computer to collect standard Internet log information and visitor behavior information. When you visit our websites, we may collect information from you automatically through cookies or similar technology<br />
|
||||
|
||||
For further information, visit <a href="httpsd//allaboutcookies.org">allaboutcookies.org</a>.
|
||||
|
||||
|
@ -131,3 +130,10 @@ Should you wish to report a complaint, or if you feel that we haven’t addresse
|
|||
|
||||
We also offer the <a href="https://akko.chir.rs/web">Mastodon Web UI</a>. Keep in mind that some features are missing,
|
||||
like emoji reactions, quoting, and JPEG XL.
|
||||
|
||||
<h3>Art Credit</h3>
|
||||
|
||||
<ul>
|
||||
<li>Bun, blobfox, vlpn, raccoon, fox, gphn, neofox, neocat, drgn, floof: Created by <a href="https://is-a.wyvern.rip/@volpeon">@volpeon@is-a.wyvern.rip</a></li>
|
||||
<li>rosahaj pride: by <a href="https://alpaka.social/@braid">@braid@alpaka.social</a></li>
|
||||
</ul>
|
|
@ -224,6 +224,7 @@ rec {
|
|||
emoji-volpeon-vlpn
|
||||
emoji-volpeon-neofox
|
||||
emoji-volpeon-neocat
|
||||
emoji-volpeon-floof
|
||||
emoji-caro
|
||||
lotte-art
|
||||
alco-sans
|
||||
|
|
|
@ -22,6 +22,7 @@ in
|
|||
emoji-volpeon-vlpn = self.callPackage ../packages/art/emoji/volpeon/vlpn.nix {};
|
||||
emoji-volpeon-neofox = self.callPackage ../packages/art/emoji/volpeon/neofox.nix {};
|
||||
emoji-volpeon-neocat = self.callPackage ../packages/art/emoji/volpeon/neocat.nix {};
|
||||
emoji-volpeon-floof = self.callPackage ../packages/art/emoji/volpeon/floof.nix {};
|
||||
emoji-caro = self.callPackage ../packages/art/emoji/caro {};
|
||||
lotte-art = self.callPackage ../packages/art/lotte {};
|
||||
alco-sans = self.callPackage ../packages/fonts/kreative/alco-sans.nix {};
|
||||
|
|
10
packages/art/emoji/volpeon/floof.json
Normal file
10
packages/art/emoji/volpeon/floof.json
Normal file
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"floof": {
|
||||
"description": "Character by @volpeon@is-a.wyvern.rip",
|
||||
"files": "floof.json",
|
||||
"homepage": "https://volpeon.ink/emojis/floof/",
|
||||
"src": "https://volpeon.ink/emojis/floof/floof.zip",
|
||||
"src_sha256": "0e6f66a8df0a1dd724cb3aca0a7d480da7200350933d867946c61db518248c2f",
|
||||
"license": "CC BY-NC-SA 4.0"
|
||||
}
|
||||
}
|
10
packages/art/emoji/volpeon/floof.nix
Normal file
10
packages/art/emoji/volpeon/floof.nix
Normal file
|
@ -0,0 +1,10 @@
|
|||
{callPackage}:
|
||||
callPackage ../../../lib/mkPleromaEmoji.nix {} rec {
|
||||
name = "floof";
|
||||
manifest = ./${name}.json;
|
||||
passthru.updateScript = [
|
||||
../../../scripts/update-json.sh
|
||||
"https://volpeon.ink/emojis/${name}/manifest.json"
|
||||
"art/emoji/volpeon/${name}.json"
|
||||
];
|
||||
}
|
Loading…
Reference in a new issue