From a0f77af2004554dc437b39da60938de804228087 Mon Sep 17 00:00:00 2001 From: moko256 Date: Fri, 20 Oct 2017 23:26:58 +0900 Subject: [PATCH 1/4] Add document of emoji --- Using-the-API/API.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Using-the-API/API.md b/Using-the-API/API.md index b3729042..80a92bd7 100644 --- a/Using-the-API/API.md +++ b/Using-the-API/API.md @@ -27,6 +27,7 @@ API overview - [Attachment](#attachment) - [Card](#card) - [Context](#context) + - [Emoji](#emoji) - [Error](#error) - [Instance](#instance) - [Mention](#mention) @@ -640,6 +641,14 @@ ___ | `ancestors` | The ancestors of the status in the conversation, as a list of [Statuses](#status) | no | | `descendants` | The descendants of the status in the conversation, as a list of [Statuses](#status) | no | +### Emoji + +| Attribute | Description | Nullable | +|--------------------------|------------------------------------|----------| +| `shortcode` | The shortcode of the emoji | no | +| `static_url` | URL to the emoji static image | no | +| `url` | URL to the emoji image | no | + ### Error | Attribute | Description | Nullable | @@ -716,6 +725,7 @@ ___ | `reblog` | `null` or the reblogged [Status](#status) | yes | | `content` | Body of the status; this will contain HTML (remote HTML already sanitized) | no | | `created_at` | The time the status was created | no | +| `emojis` | An array of [Emoji](#emoji) | yes | | `reblogs_count` | The number of reblogs for the status | no | | `favourites_count` | The number of favourites for the status | no | | `reblogged` | Whether the authenticated user has reblogged the status | yes | From 493c07ef10b9cc30d8cbf81aa6837ad5aaa0656d Mon Sep 17 00:00:00 2001 From: "Renato \"Lond\" Cerqueira" Date: Mon, 23 Oct 2017 13:15:35 +0200 Subject: [PATCH 2/4] Update Mastodon Twitter Poster URL in Apps.md --- Using-Mastodon/Apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-Mastodon/Apps.md b/Using-Mastodon/Apps.md index 6ecb2fea..297cdb7a 100644 --- a/Using-Mastodon/Apps.md +++ b/Using-Mastodon/Apps.md @@ -107,7 +107,7 @@ Some people have started working on apps for the Mastodon API. Here is a list of |[WordPress](http://mastodon.tools/wordpress/)|WordPress plugin||[@David@mastodon.xyz](https://mastodon.xyz/@David)| |[Autopost to Mastodon](https://wordpress.org/plugins/autopost-to-mastodon/)|Wordpress plugin||[L1am0](http://l1am0.eu/)| |[ogp-share](http://mastodon.tools/ogp-share/) (beta)|Web browser||[@David@mastodon.xyz](https://mastodon.xyz/@David)| -|[Mastodon Twitter Poster](https://mastodon-twitter-poster.herokuapp.com)|Service||[@renatolond@masto.donte.com.br](https://masto.donte.com.br/@renatolond)| +|[Mastodon Twitter Poster](https://crossposter.masto.donte.com.br)|Service||[@renatolond@masto.donte.com.br](https://masto.donte.com.br/@renatolond)| ## Bots From 3789996bf873776de64d06d13f296e945f953b93 Mon Sep 17 00:00:00 2001 From: Alexander Terczka Date: Mon, 23 Oct 2017 14:48:47 +0200 Subject: [PATCH 3/4] Anonymous git URL is easier for the initial git clone HTTPS hint added --- Running-Mastodon/Docker-Guide.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Running-Mastodon/Docker-Guide.md b/Running-Mastodon/Docker-Guide.md index 2c399441..b59d6095 100644 --- a/Running-Mastodon/Docker-Guide.md +++ b/Running-Mastodon/Docker-Guide.md @@ -14,7 +14,7 @@ The project now includes a `Dockerfile` and a `docker-compose.yml` file (which r Clone Mastodon's repository. - git clone git@github.com:tootsuite/mastodon.git + git clone https://github.com/tootsuite/mastodon cd mastodon Review the settings in `docker-compose.yml`. Note that it is **not default** to store the postgresql database and redis databases in a persistent storage location. If you plan on running your instance in production, you **must** uncomment the [`volumes` directive](https://github.com/tootsuite/mastodon/blob/972f6bc861affd9bc40181492833108f905a04b6/docker-compose.yml#L7-L16) in `docker-compose.yml`. @@ -65,6 +65,12 @@ If you wish to run this as a daemon process instead of monitoring it on console, Then you may login to your new Mastodon instance by browsing to http://localhost:3000/ +If your docker server is not on your local computer you may ssh to the docker first using this command: + + ssh user@your-server -L 3000:localhost:3000 + +If you set `LOCAL_HTTPS` to true before, you have to prepare your TLS nginx first [production guide](Production-guide.md) because connecting to port 3000 redirects you to HTTPS. + Following that, make sure that you read the [production guide](Production-guide.md). You are probably going to want to understand how to configure Nginx to make your Mastodon instance available to the rest of the world. From 0eeb9408181c709499563d0e99b138ab9670390d Mon Sep 17 00:00:00 2001 From: Alexander Terczka Date: Fri, 27 Oct 2017 01:54:55 +0200 Subject: [PATCH 4/4] Update Docker-Guide.md Removed the ssh port forwarding info --- Running-Mastodon/Docker-Guide.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Running-Mastodon/Docker-Guide.md b/Running-Mastodon/Docker-Guide.md index b59d6095..a05b8cc7 100644 --- a/Running-Mastodon/Docker-Guide.md +++ b/Running-Mastodon/Docker-Guide.md @@ -65,10 +65,6 @@ If you wish to run this as a daemon process instead of monitoring it on console, Then you may login to your new Mastodon instance by browsing to http://localhost:3000/ -If your docker server is not on your local computer you may ssh to the docker first using this command: - - ssh user@your-server -L 3000:localhost:3000 - If you set `LOCAL_HTTPS` to true before, you have to prepare your TLS nginx first [production guide](Production-guide.md) because connecting to port 3000 redirects you to HTTPS. Following that, make sure that you read the [production guide](Production-guide.md). You are probably going to want to understand how