From 552e950d7a68bcec0926cd31be9bafe387c0a7b6 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 31 Mar 2021 22:08:03 -0600
Subject: [PATCH 1/4] New License formats

---
 app/Http/Controllers/ComposeController.php    |   6 +-
 app/Media.php                                 |  22 ++++
 app/Transformer/Api/MediaDraftTransformer.php |   8 --
 app/Transformer/Api/MediaTransformer.php      |   3 +-
 app/Util/Media/License.php                    | 123 ++++++++++++++++++
 5 files changed, 152 insertions(+), 10 deletions(-)
 create mode 100644 app/Util/Media/License.php

diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php
index 35bba5c9a..6d62ab07d 100644
--- a/app/Http/Controllers/ComposeController.php
+++ b/app/Http/Controllers/ComposeController.php
@@ -45,6 +45,7 @@ use App\Services\ServiceService;
 use Illuminate\Support\Str;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\Extractor;
+use App\Util\Media\License;
 
 class ComposeController extends Controller
 {
@@ -407,6 +408,7 @@ class ComposeController extends Controller
 			'place' => 'nullable',
 			'comments_disabled' => 'nullable',
 			'tagged' => 'nullable',
+			'license' => 'nullable|integer|min:1|max:16'
 			// 'optimize_media' => 'nullable'
 		]);
 
@@ -439,6 +441,8 @@ class ComposeController extends Controller
 
 		abort_if($limitReached == true, 429);
 
+		$license = in_array($request->input('license'), License::keys()) ? $request->input('license') : null;
+
 		$visibility = $request->input('visibility');
 		$medias = $request->input('media');
 		$attachments = [];
@@ -458,7 +462,7 @@ class ComposeController extends Controller
 				abort(403, 'Invalid media id');
 			}
 			$m->filter_class = in_array($media['filter_class'], Filter::classes()) ? $media['filter_class'] : null;
-			$m->license = $media['license'];
+			$m->license = $license;
 			$m->caption = isset($media['alt']) ? strip_tags($media['alt']) : null;
 			$m->order = isset($media['cursor']) && is_int($media['cursor']) ? (int) $media['cursor'] : $k;
 			// if($optimize_media == false) {
diff --git a/app/Media.php b/app/Media.php
index 3854c3848..107f15b4d 100644
--- a/app/Media.php
+++ b/app/Media.php
@@ -4,6 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use App\Util\Media\License;
 use Storage;
 
 class Media extends Model
@@ -101,4 +102,25 @@ class Media extends Model
             return $meta['Model'];
         }
     }
+
+    public function getLicense()
+    {
+        $license = $this->license;
+
+        if(!$license || strlen($license) > 2 || $license == 1) {
+            return null;
+        }
+
+        if(!in_array($license, License::keys())) {
+            return null;
+        }
+
+        $res = License::get()[$license];
+
+        return [
+            'id' => $res['id'],
+            'title' => $res['title'],
+            'url' => $res['url']
+        ];
+    }
 }
diff --git a/app/Transformer/Api/MediaDraftTransformer.php b/app/Transformer/Api/MediaDraftTransformer.php
index bb531f556..1f6c578c0 100644
--- a/app/Transformer/Api/MediaDraftTransformer.php
+++ b/app/Transformer/Api/MediaDraftTransformer.php
@@ -10,14 +10,6 @@ class MediaDraftTransformer extends Fractal\TransformerAbstract
 {
     public function transform(Media $media)
     {
-
-        $url = URL::temporarySignedRoute(
-            'temp-media', now()->addHours(1), ['profileId' => $media->profile_id, 'mediaId' => $media->id, 'timestamp' => time()]
-        );
-
-        //$url = $media->thumbnailUrl();
-        //$url = $media->url();
-
         return [
             'id'            => (string) $media->id,
             'type'          => $media->activityVerb(),
diff --git a/app/Transformer/Api/MediaTransformer.php b/app/Transformer/Api/MediaTransformer.php
index a5d0a0adb..21c0b25b5 100644
--- a/app/Transformer/Api/MediaTransformer.php
+++ b/app/Transformer/Api/MediaTransformer.php
@@ -15,10 +15,11 @@ class MediaTransformer extends Fractal\TransformerAbstract
             'url'           => $media->url(),
             'remote_url'    => null,
             'preview_url'   => $media->thumbnailUrl(),
+            'optimized_url' => $media->optimized_url,
             'text_url'      => null,
             'meta'          => null,
             'description'   => $media->caption,
-            'license'       => $media->license,
+            'license'       => $media->getLicense(),
             'is_nsfw'       => $media->is_nsfw,
             'orientation'   => $media->orientation,
             'filter_name'   => $media->filter_name,
diff --git a/app/Util/Media/License.php b/app/Util/Media/License.php
new file mode 100644
index 000000000..653013a4d
--- /dev/null
+++ b/app/Util/Media/License.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Util\Media;
+
+class License {
+
+    public static function get()
+    {
+        return [
+            1 => [
+                "id" => 1,
+                "title" => "All Rights Reserved",
+                "name" => "All Rights Reserved",
+                "description" => "You, the copyright holder, reserve all rights provided by copyright law, such as the right to make copies, distribute your work, perform your work, license, or otherwise exploit your work; no rights are waived under this license.",
+                "terms" => [],
+                "url" => url('/site/kb/licenses')
+            ],
+            5 => [
+                "id" => 5,
+                "title" => "Public Domain",
+                "name" => "Public Domain Work",
+                "description" => "Works, or aspects of copyrighted works, which copyright law does not protect.",
+                "terms" => [],
+                "url" => url('/site/kb/licenses')
+            ],
+            6 => [
+                "id" => 6,
+                "title" => "Public Domain (CC0)",
+                "name" => "Public Domain Dedication (CC0)",
+                "description" => "You, the copyright holder, waive your interest in your work and place the work as completely as possible in the public domain so others may freely exploit and use the work without restriction under copyright or database law.",
+                "terms" => [],
+                "url" => url('/site/kb/licenses')
+            ],
+            11 => [
+                "id" => 11,
+                "title" => "CC BY",
+                "name" => "Attribution",
+                "description" => "This license allows reusers to distribute, remix, adapt, and build upon the material in any medium or format, so long as attribution is given to the creator. The license allows for commercial use.",
+                "terms" => [
+                    "Credit must be given to the creator",
+                ],
+                "url" => "https://creativecommons.org/licenses/by/4.0/"
+            ],
+            12 => [
+                "id" => 12,
+                "title" => "CC BY-SA",
+                "name" => "Attribution-ShareAlike",
+                "description" => "This license allows reusers to distribute, remix, adapt, and build upon the material in any medium or format, so long as attribution is given to the creator. The license allows for commercial use. If you remix, adapt, or build upon the material, you must license the modified material under identical terms.",
+                "terms" => [
+                    "Credit must be given to the creator",
+                    "Adaptations must be shared under the same terms"
+                ],
+                "url" => "https://creativecommons.org/licenses/by-sa/4.0/"
+            ],
+            13 => [
+                "id" => 13,
+                "title" => "CC BY-NC",
+                "name" => "Attribution-NonCommercial",
+                "description" => "This license allows reusers to distribute, remix, adapt, and build upon the material in any medium or format for noncommercial purposes only, and only so long as attribution is given to the creator.",
+                "terms" => [
+                    "Credit must be given to the creator",
+                    "Only noncommercial uses of the work are permitted"
+                ],
+                "url" => "https://creativecommons.org/licenses/by-nc/4.0/"
+            ],
+            14 => [
+                "id" => 14,
+                "title" => "CC BY-NC-SA",
+                "name" => "Attribution-NonCommercial-ShareAlike",
+                "description" => "This license allows reusers to distribute, remix, adapt, and build upon the material in any medium or format for noncommercial purposes only, and only so long as attribution is given to the creator. If you remix, adapt, or build upon the material, you must license the modified material under identical terms.",
+                "terms" => [
+                    "Credit must be given to the creator",
+                    "Only noncommercial uses of the work are permitted",
+                    "Adaptations must be shared under the same terms"
+                ],
+                "url" => "https://creativecommons.org/licenses/by-nc-sa/4.0/"
+            ],
+            15 => [
+                "id" => 15,
+                "title" => "CC BY-ND",
+                "name" => "Attribution-NoDerivs",
+                "description" => "This license allows reusers to copy and distribute the material in any medium or format in unadapted form only, and only so long as attribution is given to the creator. The license allows for commercial use.",
+                "terms" => [
+                    "Credit must be given to the creator",
+                    "No derivatives or adaptations of the work are permitted"
+                ],
+                "url" => "https://creativecommons.org/licenses/by-nd/4.0/"
+            ],
+            16 => [
+                "id" => 16,
+                "title" => "CC BY-NC-ND",
+                "name" => "Attribution-NonCommercial-NoDerivs",
+                "description" => "This license allows reusers to copy and distribute the material in any medium or format in unadapted form only, for noncommercial purposes only, and only so long as attribution is given to the creator.",
+                "terms" => [
+                    "Credit must be given to the creator",
+                    "Only noncommercial uses of the work are permitted",
+                    "No derivatives or adaptations of the work are permitted"
+                ],
+                "url" => "https://creativecommons.org/licenses/by-nc-nd/4.0/"
+            ]
+        ];
+    }
+
+    public static function keys()
+    {
+        return array_keys(self::get());
+    }
+
+    public static function getId($index)
+    {
+        return self::get()[$index]['id'];
+    }
+
+    public static function names()
+    {
+        return collect(self::get())
+            ->map(function($v) {
+                return $v['title'];
+            })
+            ->values()
+            ->toArray();
+    }
+}

From 4ad573c8de4a401bd4aa214ae7121ad66f55bf86 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 31 Mar 2021 22:24:59 -0600
Subject: [PATCH 2/4] Update components

---
 .../assets/js/components/ComposeModal.vue     | 100 ++++++++++++++++--
 .../components/presenter/PhotoPresenter.vue   |  17 ++-
 2 files changed, 107 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue
index e2c054ac3..e118f189c 100644
--- a/resources/assets/js/components/ComposeModal.vue
+++ b/resources/assets/js/components/ComposeModal.vue
@@ -12,6 +12,7 @@
 				</div>
 			</div>
 		</div>
+
 		<div v-else-if="page == 'cameraRoll'">
 			<div class="card status-card card-md-rounded-0" style="display:flex;">
 				<div class="card-header d-inline-flex align-items-center justify-content-between bg-white">
@@ -42,6 +43,7 @@
 				</div>
 			</div>
 		</div>
+
 		<div v-else>
 			<div class="card status-card card-md-rounded-0 w-100 h-100" style="display:flex;">
 				<div class="card-header d-inline-flex align-items-center justify-content-between bg-white">
@@ -91,8 +93,21 @@
 					</div>
 				</div>
 				<div class="card-body p-0 border-top">
+					<div v-if="page == 'licensePicker'" class="w-100 h-100" style="min-height: 280px;">
+						<div class="list-group list-group-flush">
+							<div
+								v-for="(item, index) in availableLicenses"
+								class="list-group-item cursor-pointer" 
+								:class="{ 
+									'text-primary': licenseIndex === index,  
+									'font-weight-bold': licenseIndex === index
+								}" 
+								@click="toggleLicense(index)">
+								{{item.name}}
+							</div>
+						</div>
+					</div>
 					<div v-if="page == 'textOptions'" class="w-100 h-100" style="min-height: 280px;">
-						test
 					</div>
 					<div v-if="page == 'addText'" class="w-100 h-100" style="min-height: 280px;">
 						<div class="mt-2">
@@ -315,7 +330,10 @@
 							</div>
 						</div>
 						<div class="border-bottom">
-							<p class="px-4 mb-0 py-2 cursor-pointer" @click="showTagCard()">Tag people <span class="ml-2 badge badge-primary">NEW</span></p>
+							<p class="px-4 mb-0 py-2 cursor-pointer" @click="showTagCard()">Tag people</p>
+						</div>
+						<div class="border-bottom">
+							<p class="px-4 mb-0 py-2 cursor-pointer" @click="showLicenseCard()">Add license <span class="ml-2 badge badge-primary">NEW</span></p>
 						</div>
 						<div class="border-bottom">
 							<p class="px-4 mb-0 py-2 cursor-pointer" @click="showLocationCard()" v-if="!place">Add location</p>
@@ -565,11 +583,19 @@
 								</div>
 								<div class="form-group">
 									<label class="font-weight-bold text-muted small">License</label>
-									<input type="text" class="form-control" v-model="media[carouselCursor].license" placeholder="All Rights Reserved (Default license)">
-									<p class="help-text small text-muted mb-0 d-flex justify-content-between">
+									<!-- <input type="text" class="form-control" v-model="media[carouselCursor].license" placeholder="All Rights Reserved (Default license)"> -->
+									<!-- <p class="help-text small text-muted mb-0 d-flex justify-content-between">
 										<span></span>
 										<span>{{media[carouselCursor].license ? media[carouselCursor].license.length : 0}}/140</span>
-									</p>
+									</p> -->
+									<select class="form-control" v-model="licenseIndex">
+										<option 
+											v-for="(item, index) in availableLicenses"
+											:value="index"
+											:selected="index === licenseIndex">
+											{{item.name}}
+										</option>
+									</select>
 								</div>
 							</div>
 						</div>
@@ -707,7 +733,8 @@ export default {
 				'editMedia',
 				'cameraRoll',
 				'tagPeopleHelp',
-				'textOptions'
+				'textOptions',
+				'licensePicker'
 			],
 			cameraRollMedia: [],
 			taggedUsernames: [],
@@ -744,7 +771,46 @@ export default {
 						})
 					}
 				]
-			}
+			},
+			availableLicenses: [
+				{
+					id: 1,
+					name: "All Rights Reserved"
+				},
+				{
+					id: 5,
+					name: "Public Domain Work"
+				},
+				{
+					id: 6,
+					name: "Public Domain Dedication (CC0)"
+				},
+				{
+					id: 11,
+					name: "Attribution"
+				},
+				{
+					id: 12,
+					name: "Attribution-ShareAlike"
+				},
+				{
+					id: 13,
+					name: "Attribution-NonCommercial"
+				},
+				{
+					id: 14,
+					name: "Attribution-NonCommercial-ShareAlike"
+				},
+				{
+					id: 15,
+					name: "Attribution-NoDerivs"
+				},
+				{
+					id: 16,
+					name: "Attribution-NonCommercial-NoDerivs"
+				}
+			],
+			licenseIndex: 0
 		}
 	},
 
@@ -934,7 +1000,8 @@ export default {
 						comments_disabled: this.commentsDisabled,
 						place: this.place,
 						tagged: this.taggedUsernames,
-						optimize_media: this.optimizeMedia
+						optimize_media: this.optimizeMedia,
+						license: this.availableLicenses[this.licenseIndex].id
 					};
 					axios.post('/api/compose/v0/publish', data)
 					.then(res => {
@@ -1026,6 +1093,10 @@ export default {
 					this.showTagCard();
 				break;
 
+				case 'licensePicker':
+					this.page = 3;
+				break;
+
 				default:
 					this.namedPages.indexOf(this.page) != -1 ? 
 					this.page = (this.textMode ? 'addText' : 3) : 
@@ -1270,7 +1341,18 @@ export default {
 		showTextOptions() {
 			this.page = 'textOptions';
 			this.pageTitle = 'Text Post Options';
-		}
+		},
+
+		showLicenseCard() {
+			this.pageTitle = 'Select a License';
+			this.page = 'licensePicker';
+		},
+
+		toggleLicense(index) {
+			this.licenseIndex = index;
+			this.pageTitle = '';
+			this.page = 3;
+		},
 	}
 }
 </script>
\ No newline at end of file
diff --git a/resources/assets/js/components/presenter/PhotoPresenter.vue b/resources/assets/js/components/presenter/PhotoPresenter.vue
index 85f23e8a1..d350c7aea 100644
--- a/resources/assets/js/components/presenter/PhotoPresenter.vue
+++ b/resources/assets/js/components/presenter/PhotoPresenter.vue
@@ -22,7 +22,7 @@
 			:alt="altText(status)"/>
 	</div>
 	<div v-else>
-		<div :title="status.media_attachments[0].description">
+		<div :title="status.media_attachments[0].description" style="position: relative;">
 			<img class="card-img-top" 
 				:src="status.media_attachments[0].url" 
 				loading="lazy" 
@@ -30,6 +30,21 @@
 				:width="width()"
 				:height="height()"
 				onerror="this.onerror=null;this.src='/storage/no-preview.png'">
+
+				<p 
+					v-if="status.media_attachments[0].license"
+					style="
+				    margin-bottom: 0;
+				    padding: 0 5px;
+				    color: #fff;
+				    font-size: 10px;
+				    text-align: right;
+				    position: absolute;
+				    bottom: 0;
+				    right: 0;
+				    border-top-left-radius: 5px;
+				    background: linear-gradient(0deg, rgba(0,0,0,0.5), rgba(0,0,0,0.5));
+				"><a :href="status.url" class="font-weight-bold text-light">Photo</a> by <a :href="status.account.url" class="font-weight-bold text-light">&commat;{{status.account.username}}</a> licensed under <a :href="status.media_attachments[0].license.url" class="font-weight-bold text-light">{{status.media_attachments[0].license.title}}</a></p>
 		</div>
 	</div>
 </template>

From b22a59337fc464f8d28e443b25ff6b263548028b Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 31 Mar 2021 22:25:23 -0600
Subject: [PATCH 3/4] Update compiled assets

---
 public/js/compose.js     | Bin 144241 -> 145430 bytes
 public/js/profile.js     | Bin 110236 -> 111006 bytes
 public/js/rempos.js      | Bin 72619 -> 73389 bytes
 public/js/status.js      | Bin 120615 -> 121385 bytes
 public/js/timeline.js    | Bin 175586 -> 176356 bytes
 public/mix-manifest.json | Bin 2139 -> 2139 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/compose.js b/public/js/compose.js
index 1f3ff97996bbc9d0dfbf77c66e01dab48b78f495..e83d89dff8536ca596cc58cca2dcb87b7c85edb8 100644
GIT binary patch
delta 2813
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

delta 1732
zcmY*ZZ){Ul6wi74SB7kC>qghHtt(l1Pwu)72V&u^d)?}&u(3S|C>w0;dbf7Gy^Z#5
z4%P+rgZPgu(73A@RQ`McgPHWhQy>wdaT33v#<&=aF(#;px&gt&D0;eX6w=)O-tU~>
zIp@A}?z<B+hS}?e$phJOviMX%My+?h-x|Ai+MK?5=!v%2;R~<Cua@o1EcA%O1EGM$
zA&O$7OC3@aXCskfuFA4Uq$HI{t4L$V_Z#zxoYJ;Nqpidn8?Q8Hd2Kc?af`9My#+?n
zl9ITS@$UGym3;u7n0w_aXo;&U8Gszm6wJf%E$_UXo!m~%;<d5&XUYvdeg|FSuU!}W
zW@cN8)XeTpku$TyDZ<|xOOcvcb8PBXb;@w>mOn*;x5X4Wds|77iaR^v)2H3}X-Z>T
z?70)=c_H39*Dhg<SQUS@W{o|6qAXr_v9>loa;HDL+#^=+4)`>mGt}?vr5)9MgS2<O
z-xr~4Ye_Yc;_3grz=6yT0`TBvlK@_Dv%isXEn@7&U&>hn2L))_!9hK=us1lkhVr2_
zaH4TC4K5<|rvsnq=BZ$_#nf|^`lWQp!^W|%GC)LFnh94B#<E~JyPFC7a@u%}P!bYG
zsm;bG9ni*(W`PAZu?tyHwycTQgwZh7hQg{vvxn)R;_IgTCN`4=)mYGC0I8%23kt$m
z&yd=!g$7WkEu?j`r~%y2q<?IHsZ1<=Fc(%MoKM2<xtK&|rAvW;tUt9Bc7wsos{#p&
zUVSnTsyT~CRPFsCbt4V+1~nq34vNR+aC*pQRzC{G%w&Wzw#x`+)@p<$*uLFHu!6*%
zH$u@y+5T)Opan^@PYc@neIvYg-q0@ycm$K?kjl&UV6w^s!g)(CDqGkOM(~;>9B=o)
zFb!J;vOg8v!s-iQCC(*S2wSi*9~MFd!gqyG0&e|oA^cN{^!8)$CU)acEqtAwBhSsL
zra}~HG%D+=3%*Q)Hod+9))g$1vF|vOkX@lYny3*~tZ)cK*2lL4m$nE)?IY-y^`p;#
zAu-{TJK+;UBBP5sYhuT57O}EUSj@)TVFh~Q?eJOg{gjbzpF*F0AnB0~Op3DCJD~~T
z`%XMlGBb67hH$70N)g`c!Z(rGR2P)vtbXo-pAu!i@Pj##*scu>CiY7c4`PxMncedz
z2CUn=K~1QS1s+zb538>RU=6A>DGa9{@Q6Mf_rQA32C*s<je6>uUA#whkP%#+xVDK7
z!HG_Xi|-VxJS5@UCXS>g(o7<&Ji?r&8F!Y9dB7hb%~j|pBbXx^m9UJ0P}k_<B}}!t
z0sr>k+M1|?UaYf6tdej~30p&|P9srPNmxf>ReeyBgOBTnePPRHvE4%?eS07L3)yXa
zhy;mGAZ=`y0+q<s1^$`>M?lic`{7g?c=S&PValw(^(sc`RpYQVhkfua)acib!P^=7
znUgS{yJT#Pbc;M*H+b_n^xxtzozEsdhjw-@n=8uGXhiE!JG6zLmF4{fMS8{+D7LZ7
zm!U+z@h5!rC=1_&4Q!u@Gi52EZmLEoyS9v5ai9G7E0nTw6St^N+c!v^R*jBmRx<bX
z2M3e@4LhxpqFCg_XBn}`G(y9}G+^NyX^(G6(Jb>x1r{)IRZHgC7#UEVqwMSru(3-f
z&YC@Mw-P#$%RR~L#oQWp_!1Pd^Tk}HVczRvt<zv$*x7`cGqK9Mkk4M4hFtyXa;~W4
M{;kaZc%0+^2d{A;$p8QV

diff --git a/public/js/profile.js b/public/js/profile.js
index e74c11967c708f05fd2d13fab1fb9ce1f8f03e45..4cc3b0c000ae07cb7cf93e7cdc3486cd33ff2f31 100644
GIT binary patch
delta 724
zcmZ{iKWG#|6vmm$-Dx~91c^~1VSQTclHK!idPKKT&?ZGpBw}Gall?Qdw`6Z-nVmiI
zhcgx;3POY_wlIjbg$P>&>}~XlXlxZh1R*I>T8Vp`Tr`4A^Z4G6?|buR);{N-f6Kpq
znCqD&*Tjd-!Kic#WwSTxH%Fq4EP5P2$lZCHod}zgVyEwPzMN2?h%fKn<e|er^b4Vh
z!(*eB3uEUmmBm_nCVG`Y$M==>b_P{Ye6>9{l)6OYchRgMM~1}`I~tdNe9Az;4enag
ze9^=DvQGn-yOij_u$Smf3@tUzZw;V=%8Rp286;3tLAQoiJlDb`z?X>(KB&tFY@lH<
z$0eFcIj0TKp#-XL*tScYq?RiF0;m@CDAVCgtyTjSYLsv-aF=ibkCr-p;CO*+hUYpY
z(U|Mhd1A6Z--=-d)C)NVbvGpqNwKs7lQJ7KjZ<IqaE)usu-!07tkQJTu;v{`Lt^XT
zxda<bb2<bjTrSzzQ6=V>hFnt9Q>-Ze3K>Na_nw~1CG*vJv^tN@9-FFDPC=<E-Bp>3
z(R~x05Odf2qpudq{ecIk49iN=c`;;OtEJBDF82zIBt;<eVrQLUP~4{i%!tvz%3tn#
z4`55lB{2JMl6c=UaB`15kd`KOo^q($<u3Qqh^nF|T`VhAvHEd5l6=%Jr0If?HV=tM
e+ZTJg9}dJu->LZf_LD;V;^*z&b(BTVUj7Ed)%NfJ

delta 192
zcmbRDm~GBowhe8pn~m9`jxzgaR!zR}+j8=^(={vsnMUQ)<2e|mSaNbAEvMIVFm|#;
zx*PjVzWCc>@`f{_o6nr%muAUI(l*$9|7AS$=7hJRj2y9=v6{7-I?>Y~6fp)*a_64B
z^P@dSN?Ni>l9@^BrcW!m*_1#!lqOF+t;hqiK}oY#CnwQ7Z1TnZa+^>8wcrHX2D1aM
Xb@JIWg>cShx3i{<+nL!JXRiVPCUZ;p

diff --git a/public/js/rempos.js b/public/js/rempos.js
index 8c3861383a12a0aa559a3ae0b8dcc24222cd8167..001c24a7237402d4731a62027e3f2ba3b3174848 100644
GIT binary patch
delta 681
zcmZ`%O=}ZD7-s3lS}CDmk~T$cG7{LelO?H!l0|I~f?i6jRw$HGW_Kr>!OcvZosIo4
zc=pyZlz0__2(}>X!BemP49_0Cd$H<d`+-tqFE7tLU-Qm>{Hz}y>7Nc$sksJy0A!U+
zj)n$UZmrD97r)=c2dUL5eJScT<YKxwo^Z?_Y>@3o^4-t6927J1*$sb03FK}mBVWxJ
zGF{4Cp0C#K%-^oh$y=p0xqO^E2V!<y)AZGLV`Zq12Qz#5#6GUqH%34xkRa|;u@zu@
zr^7-b2%|ROI8b;OgC30E-py+A$@h$$*0Zkz;$j-&1=Y9%;LbmC&_>)RwCpe;SR2@&
z0$>Mu9-+RP3$@NBfG!Idx53S3vk4$*GAha;*~W@otqjkBz?-6s0^(DJapJdxGCA*6
zKu*YlNMHa@Qj(B_mP~4$rQDKICSeY8pZlCe)U!cAC`P>ObL0_Bg;DXa4-4FPkWqoj
zXVuILfC+m2y)kW4PV7&}g>RQqs#r@%>r1ZxHKV1kK5j9=fVpl$VQq8`P;j>TT2`C7
z$d}U}t~}&HuLsvosEc4$4WS{d;S!_JLawW-3M&dRr>Kq1zidy}?iJKsF#lgfUeAr6
xGOb8u$>M%)_-gqxP!JI$zU!u~!m%L_?!6y7`*ncaO<jv$-v4nF4}Oha{{!<3;idop

delta 167
zcmZ3xmu2;KmJMrJH%GCBOH95ew}T}h)2Mv16u%TpPEMrd<O{5wo98Q@lVr(C(l*#!
zXdTbYomf&*RBTmUl39{7nV&^rvYsXPWDWcKjIq=Eq!^<nJ2-oBrlcjCB$=6{Dovii
zDzkaL^Y^`MN+1K2rUx)GD)NA=P|~c`0o%Z<?#lsFKl!74A)K>0OTm<J`!YsGc3A*6
Cq&Is2

diff --git a/public/js/status.js b/public/js/status.js
index f42352fe8e53f82d9c4d372a0072712690aed2b2..493beead1248c8a0c12348f2c338f56727083931 100644
GIT binary patch
delta 936
zcmZva&ubGw6vug*{sK{>jfxaWM=e>L#H3opg{3M%s!&r~Z?%NY?j)VM?xwqwkfe>`
zkAtEpIET?o#UG$OSd=KMB7%Z~f(KE&s{IGllfTi;8moxx<;|PVeBb-Nw^wFbrf;@f
z?{04DPMJw0-mZb=Ei{65kM3C~9^8fFwM6rY523VDw5T4AD~eL?H4BCzmvM<d{}^g3
z^`d>GjN}r3_i-ke`ory*oZNv2`OK%4ErVTMgLsW1f=O7)XFr9uClwOQTMlK^GW&^H
zz+->jB_}77xZ(j$Ue(ADF^I;TewAsXxUWHVDoUlRt5Q=wYXD>X!j}Z}@fTk%LYm+I
zj`-QHCm~f^`>pd#pubQ|i3<l{)gsT6?@+4Z6s`1$Yo}qeIC2UmntiXRp6GAgl<3*G
zX~X7j@!>X%&z;<{JJ18}^l7NIEic6~)YK#OAz+Fv+?kNDsgzvj99#;trj<xp86Lr+
za~wiq!xXHClF+7L3#8r4Q$U;imfYZFNYCfi<K~VbRyK${@p~FFvWcNGS|q57-TV~@
z0Y5z3E}j-4$gc+i2Mwwb(;>Z{pFF}74)b8GA%ga+c8;3SjK!F>AIT_=a9-7QYUaE+
z+><XMtXYO-%V>2rn?)F9Et5qZS|J{sh}Z8CBPAA94Vp8(oK171%oAzsN=66OjAI!E
zMiBm0#V_JxeuOfXtrI)StbEiUSr)ZbofaHV%CDYLwS76;Dww*A3~Cb9j^^qFF<B(8
zlN=7)xr`c#WB-fwNdG40NfOWBThCt`P4f`uFx@W9N3d||z^KJ6B#lUz#nQzH3TMjV
z&=Xj}2Oci_3+Bhi7X+(SJp7B=g4TI~!=H_><O8<?JbkovVPn90*lUv5{}T~Uim;@<
zj0FugR<MmK-@13%+?qUd{+eQpGJ{B7Un7$2l_C*8tV(#82j6cKi(f)eytxWH=l(VE
Y;}vwcyQbkrn;WaaSd)AHE*$Il3APDBpa1{>

delta 422
zcmZ3vg?;%t_6<gCoA0xAeKfAHEz8eLQ82KzwXL+zE6vHVs?>?MP1VcE&(AI`&~Zjc
z$J;Aqr&cOi#ZR8|W1V0SLc+7A##6_Ca`aCr7JoH0|H+j<wcWCSMik^1XO?8<=lQ1Q
zmFl=4)MwSyWa)SS6%-dFCZ`6c=A<T<6#FKYBxmSUK~*W*+Ipy|d2D|5GntXmWwPII
zL&mDf4ZjyLR!q+Rr!?91PY+|z=1YGRCrwxAXWYROkZDvtJu#b6oIO)RDJLh=a$;QP
z_J<Q0H*<=|>m_C8rD%YBrjx0YucK(Fsgq|LzkT&=#>Fg*71R9}FnTk_PoKSj(SfmI
z`<(@hnXD{XN!kX}8ILi>FJG~Yk$L;6m5ic{)Az1rT*{G>mTZz_W|BIc@fM@Z_O^A5
z8#&pOK+2V-2kc{1<N-NENwZcb$0Waa`n`Te%k3pQ7<E}$KyCu@eGw*DO=66m-Zz0!
U3@)^N%>+hM#_bFDGIq!S00m>1jQ{`u

diff --git a/public/js/timeline.js b/public/js/timeline.js
index 9da4862011d09efa2cff87fdd3c6ec0d31d6fdc8..5ebe8217336924736b0b0f416a043d9ab716a3e8 100644
GIT binary patch
delta 960
zcmZ8fO=uHA80DLGQ*DD1tJSuG=@e_0Y(m-^#k8@?>cN6WtzOi!Zjwp5bh{fjlhWA6
zQWQb)4;P%9R0MnRU=6q)`~^=QgkHpdRP^Z2!DF#b)@n<c%QxS=@4d&H@AKQ*FQ01f
zoDn>@BVp{q_K8z#Ym5LsFmNbnpSXSww%F4`b9qwuCTvjRB&?g}U?C^T@nKU-`y=sq
zT<O7sq=;jReY@_1nBW+T<a9Mf4v`VsSIA_v5$WIpJketmbUl_Rm%Y~j4widY3<1dH
z`zvJx^66QhGwTC%wR&%1IKe)>h8B-&OLS&$!cXwHzOX%WX&ZYr1*?~BZI5o=+PSTR
z{hETK?9m%&_}_Bgy@4p7INTQ`?u7I57L3$_!V=T41{8-(!(A@ztSduz6>lHD2Q&P-
z$pJxd^_|EAP^#GXAb8gI(V|Xbqd7CLQOz`B*dn@0wPAuwl5_bnC#;ibSQ!prKNcm{
z{tTLIzfe7{Ybj#nNe_=Sho#Xx<wL1?GCZVOS<MI~O-jun9K#VT<<xXqGqSw)M{^@s
zN}0N8#c*pTlfe?sm<A2ywUdN{+ar~COnJ&7RoAix?^#-QfO3-mF2~hm-qZ_}VCk=l
zE8@c33MWk~O{@?#b0M8%Xvk92S|QJ=T=k@y8q8W|!AQrjt{FtNLfHy}7&H(`ldR;o
zvPm@%k=zrGic1^SqKHfE%03hlxWxg=ezrja`>miA_4@}*YGScp{Fhs@$aW@BfKBc}
zp2g^k-QZnSDoIEG=DPz2d6DP1ZfI;27ZJ>7o%VCTgthk~aVeMmysE)F4+|G8y=2dw
zZD3uK;H!LA^S>9WQJqwn`^6a7A_1|VeY^li*xVE7U0ARKPvQJJ$M+771^GG|HE5;^
zWc$X~M)qS41k@$7<8`PLWTtvhy)#vZqQG(Qy=Zqe-?LU9dI26et_6xcOj(JVn6Dmn
tE|<r~T8eFLEwZz>9&N7-Tv&~M@wIg(HlVr6zD~5Dn_hn37)B4r{{Wa8IQ#$r

delta 472
zcmaFzkn7QHt_>}$n+@4G+2oyVQ}uH4^Rr6}bmDEx@-tHu3~X&}o$ZyfQ!ACMoF_-}
z+|vvKswqk>$Vp624N0vi2`)`b%dF7xM<@@n&nwNzu?pIpz&nkR(SP%IzFbDe_|2&T
z&P<H)%`1hruM}crn#AH~P>?@8@Cl>T_HRoVFEFwMWEz!&`7Aj(k(QG`_H}MQzk+c)
zm$<WDQf6L?2FOsIJe@=xMMF)Ud|T)3b2l??0vfzMU@M~yGo$nL-W`k=f!z3=jI69I
zSxMRk(+jUN#!tU9k5O)Vlnf)^_RsqmuP{x2d5)2H`?rIP9E{WN9A#X}k&>2dl4NF*
zI(=dZlkE0o#~5=ZSd~E9C)z9UX()l5rKDM_19nthzvXm+Rg5ACO^VAI3*o%&vz9ZO
zGHw^X&lsc4=)Apvi|HaW&;<?ZO!7c#fjX1q^Z*_vuIa6OOaefcPUB<pU<9hW&(Gw_
z0_3ZTFr8y$i?_|xsI;G+D8wW+U096Cm@~enMzK;&O)-AEzZjDpNJF1E(-$tFj}LM&
ZiEp2!#Pk9b49zM`i+O;O>V`~v>j9won}h%W

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index c57e5e88726e77c5a8e3df995821521dc6408e57..77222962ec911d791cf96038828ab6ea7f49be9d 100644
GIT binary patch
delta 132
zcmWN`u?@m75CA}l2#``m!UZ)G`2X#Xzh($(zy01K3($Ip)JT++NGy>x7yz!lZQ7>C
zb#RqYTA`5HE63&u%$~R5zB@GvEE<7R_LPwda{umME@D%Y@L!b>4WQE8--p!^fTAVL
dRm1`%o~iWZ_&J*>5Em&)DyaFKyk5p-`~eg*CMW;^

delta 132
zcmV~$u?+$-3;;lh7a)E05-F&eAn(LZTr&i<<JepL0<^yaH4-Hy5=;CV48YwsZPW8Q
zgq93rMmGWjE<%R#x()Z;Nwh1&><T8O<w8=|-~Jtlo2Mjz9Ao9I;277>;SscZ#aQRs
cM41vNroJx6@0n0tEzi^;Wv^B^`ej_kKWrr@2LJ#7


From b9221ffc27ab5d125e251a44cc8fd85e8de42a36 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 31 Mar 2021 22:28:33 -0600
Subject: [PATCH 4/4] Update changelog

---
 CHANGELOG.md | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 612a867d0..0327239a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.10...dev)
 ### Added
 - Autocomplete Support (hashtags + mentions) ([de514f7d](https://github.com/pixelfed/pixelfed/commit/de514f7d))
+- Creative Commons Licenses ([552e950](https://github.com/pixelfed/pixelfed/commit/552e950))
 
 ### Updated
 - Updated AdminController, fix variable name in updateSpam method. ([6edaf940](https://github.com/pixelfed/pixelfed/commit/6edaf940))
@@ -403,7 +404,7 @@
 - Updated CollectionController, increase limit from 18 to 50. ([c2826fd3](https://github.com/pixelfed/pixelfed/c2826fd3))
 
 ## Deprecated
-    
+
 
 ## [v0.10.6 (2019-09-30)](https://github.com/pixelfed/pixelfed/compare/v0.10.5...v0.10.6)
 
@@ -468,7 +469,7 @@
 - Run ```php artisan passport:keys```
 - Add ```OAUTH_ENABLED=true``` to .env
 - Run ```php artisan config:cache```
-    
+
 
 ## [v0.10.5 (2019-09-24)](https://github.com/pixelfed/pixelfed/compare/v0.10.4...v0.10.5)
 
@@ -479,8 +480,8 @@
 - Fixed cache bug in privacy and terms pages [#1712](https://github.com/pixelfed/pixelfed/commit/fe522da8db7a8b0d7c18d405abcb885f8678f35c)
 
 ### Changed
-    
-    
+
+
 ## [v0.10.4 (2019-09-24)](https://github.com/pixelfed/pixelfed/compare/v0.10.3...v0.10.4)
 
 ### Added
@@ -511,17 +512,17 @@
 ## Deprecated
 - Remove deprecated profile following/followers [#1697](https://github.com/pixelfed/pixelfed/pull/1697)
 - Remove old comment permalink [05f6598](https://github.com/pixelfed/pixelfed/pull/1708/commits/05f659896d903e1ff41dba810f125d721fa057e7)
-    
-    
+
+
 ## [v0.10.3 (2019-09-08)](https://github.com/pixelfed/pixelfed/compare/v0.10.2...v0.10.3)
 
 ### Added
 - Append ```.json``` to local status urls to view ActivityPub object [#1666](https://github.com/pixelfed/pixelfed/pull/1666)
 
 ### Fixed
-- Reverted ```strict``` Same-Site Cookies to ```null``` to fix 2FA/session expiry [#1667](https://github.com/pixelfed/pixelfed/pull/1667) 
-- Fixed AP errors by storing ActivityPub object id and url [#1668](https://github.com/pixelfed/pixelfed/pull/1668) [#1683](https://github.com/pixelfed/pixelfed/pull/1683) 
-- Fixed content warnings that had filter applied [#1669](https://github.com/pixelfed/pixelfed/pull/1669) 
+- Reverted ```strict``` Same-Site Cookies to ```null``` to fix 2FA/session expiry [#1667](https://github.com/pixelfed/pixelfed/pull/1667)
+- Fixed AP errors by storing ActivityPub object id and url [#1668](https://github.com/pixelfed/pixelfed/pull/1668) [#1683](https://github.com/pixelfed/pixelfed/pull/1683)
+- Fixed content warnings that had filter applied [#1669](https://github.com/pixelfed/pixelfed/pull/1669)
 
 ### Changed
 - Japanese Translations [#1673](https://github.com/pixelfed/pixelfed/pull/1673)
@@ -531,7 +532,7 @@
 
 ### Deprecated
 - Personalized Discover has been deprecated due to low use [#1670](https://github.com/pixelfed/pixelfed/pull/1670)
-    
+
 
 ## [v0.10.2 (2019-09-06)](https://github.com/pixelfed/pixelfed/compare/v0.10.1...v0.10.2)
 
@@ -551,7 +552,7 @@
 - Loops! Discover short videos
 - Preliminary support for profile PropertyValue metadata
 - Preliminary support for Direct Messages
-- Places! Run the artisan task `import:cities` 
+- Places! Run the artisan task `import:cities`
 - Emails are now validated and banned email domains are disallowed at signup. Artisan task `email:bancheck` will validate existing users.
 - .env vars `REDIS_SCHEME` and `REDIS_PATH` allow for using Redis over a Unix socket instead of TCP [#1602](https://github.com/pixelfed/pixelfed/pull/1602)
 - .env var `IMAGE_DRIVER` allows using imagick instead of gd
@@ -574,7 +575,7 @@
 - Sample nginx.conf in contrib/ now uses HTTPS instead of HTTP. Docs updated to reference this file
 - Updated register form
 - Allow users to edit email after registrations
-    
+
 
 ## [v0.10.0 (2019-07-17)](https://github.com/pixelfed/pixelfed/compare/v0.9.6...v0.10.0)
 
@@ -595,7 +596,7 @@
 
 ### Fixed
 - Hashtag post count off-by-one [#1485](https://github.com/pixelfed/pixelfed/pull/1485)
-    
+
 
 ## [v0.9.5 (2019-07-10)](https://github.com/pixelfed/pixelfed/compare/v0.9.4...v0.9.5)
 
@@ -631,8 +632,8 @@
 
 ### Removed
 - Remove Classic Compose UI [#1434](https://github.com/pixelfed/pixelfed/pull/1434), [72bffd1](https://github.com/pixelfed/pixelfed/commit/72bffd1) [a2640af](https://github.com/pixelfed/pixelfed/commit/a2640af)
-- 
-    
+-
+
 
 ## [v0.9.4 (2019-06-03)](https://github.com/pixelfed/pixelfed/compare/v0.9.0...v0.9.4)
 
@@ -672,7 +673,7 @@ php artisan config:cache
 ### Removed
 - Google Recaptcha is no longer supported (#1231)
 - Lightbox has been deprecated in favor of double-tap-to-like; it will return as a dedicated button in the future (#1277)
-    
+
 
 ## [v0.9.0 (2019-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.8.6...v0.9.0)
 
@@ -698,7 +699,7 @@ php artisan config:cache
 
 ### Removed
 - Removed identicons due to SVG compatibility issues with federation. New users will instead be assigned a default avatar.
-    
+
 
 ## [v0.8.6 (2019-04-06)](https://github.com/pixelfed/pixelfed/compare/v0.8.5...v0.8.6)