Merge pull request #93 from inovector/develop

fix calendar timezone, support s3 for x, changed doc url
inovector · May 9, 2024 · 4e21160 · 4e21160
2 parents ec6725e + 4632757
commit 4e21160
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -20,10 +20,10 @@
     "require": {
         "php": "^8.1",
         "ext-fileinfo": "*",
-        "abraham/twitteroauth": "^4.0",
         "guzzlehttp/guzzle": "^7.5",
         "illuminate/contracts": "^9.28|^10.0",
         "inertiajs/inertia-laravel": "^0.6.9",
+        "inovector/twitteroauth": "^7.0",
         "intervention/image": "^2.7",
         "php-ffmpeg/php-ffmpeg": "^1.0",
         "spatie/laravel-package-tools": "^1.14",

diff --git a/resources/js/Components/Calendar/Month/CalendarMonth.vue b/resources/js/Components/Calendar/Month/CalendarMonth.vue
@@ -46,7 +46,7 @@ const props = defineProps({
 
 const emit = defineEmits(['dateSelected'])
 
-const selectedDate = ref(new Date(props.initialDate));
+const selectedDate = ref(new Date(`${props.initialDate}T00:00:00`));
 
 const days = computed(() => {
     return [
@@ -81,26 +81,26 @@ const previousMonthDays = computed(() => {
         ? firstDayOfTheMonthWeekday - props.weekStartsOn
         : props.weekStartsOn ? 6 : 0;
 
-    const previousMonthLastMondayDayOfMonth = getDate(subDays(new Date(currentMonthDays.value[0].date), visibleNumberOfDaysFromPreviousMonth))
+    const previousMonthLastMondayDayOfMonth = getDate(subDays(new Date(`${currentMonthDays.value[0].date}T00:00:00`), visibleNumberOfDaysFromPreviousMonth))
 
     const previousMonth = subMonths(selectedDate.value, 1);
 
     return [...Array(visibleNumberOfDaysFromPreviousMonth)].map(
         (day, index) => {
-            const date = new Date(`${getYear(previousMonth)}-${(getMonth(previousMonth) + 1).toString().padStart(2, '0')}-${(previousMonthLastMondayDayOfMonth + index).toString().padStart(2, '0')}`);
+            const date = new Date(`${getYear(previousMonth)}-${(getMonth(previousMonth) + 1).toString().padStart(2, '0')}-${(previousMonthLastMondayDayOfMonth + index).toString().padStart(2, '0')}T00:00:00`);
 
             return {
                 date: format(date, 'yyyy-MM-dd'),
                 isDisabled: isDatePast(date, props.timeZone),
-                posts: []
+                posts: getDayPosts(date)
             };
         }
     );
 })
 
 const currentMonthDays = computed(() => {
     return [...Array(numberOfDaysInMonth.value)].map((day, index) => {
-        const date = new Date(`${year.value}-${month.value}-${(index + 1).toString().padStart(2, '0')}`);
+        const date = new Date(`${year.value}-${month.value}-${(index + 1).toString().padStart(2, '0')}T00:00:00`);
 
         return {
             date: format(date, 'yyyy-MM-dd'),
@@ -120,16 +120,18 @@ const nextMonthDays = computed(() => {
     const nextMonth = addMonths(selectedDate.value, 1);
 
     return [...Array(visibleNumberOfDaysFromNextMonth)].map((day, index) => {
+        const date = new Date(`${getYear(nextMonth)}-${(getMonth(nextMonth) + 1).toString().padStart(2, '0')}-${(index + 1).toString().padStart(2, '0')}T00:00:00`);
+
         return {
-            date: format(new Date(`${getYear(nextMonth)}-${(getMonth(nextMonth) + 1).toString().padStart(2, '0')}-${(index + 1).toString().padStart(2, '0')}`), 'yyyy-MM-dd'),
+            date: format(date, 'yyyy-MM-dd'),
             isDisabled: false,
-            posts: []
+            posts: getDayPosts(date)
         };
     });
 })
 
 const getWeekday = (date) => {
-    return getDay(typeof date === 'string' ? new Date(date) : date);
+    return getDay(typeof date === 'string' ? new Date(`${date}T00:00:00`) : date);
 }
 
 const getDayPosts = (date) => {

diff --git a/resources/js/Components/Calendar/Month/MonthDayItem.vue b/resources/js/Components/Calendar/Month/MonthDayItem.vue
@@ -24,7 +24,7 @@ const props = defineProps({
 })
 
 const label = computed(() => {
-    return format(new Date(props.day.date), 'd');
+    return format(new Date(`${props.day.date}T00:00:00`), 'd');
 })
 
 const style = computed(() => {
@@ -40,7 +40,7 @@ const style = computed(() => {
 const add = () => {
     const now = utcToZonedTime(new Date().toISOString(), props.timeZone);
 
-    let scheduleAt = `${props.day.date} ${format(now, 'H:mm')}`;
+    let scheduleAt = `${props.day.date} ${format(now, 'HH:mm')}`;
 
     router.visit(route('mixpost.posts.create', {schedule_at: scheduleAt}));
 }

diff --git a/resources/js/Components/Media/MediaFile.vue b/resources/js/Components/Media/MediaFile.vue
@@ -39,14 +39,17 @@ const imgHeightClass = computed(() => {
             <div v-if="media.hasOwnProperty('error')" class="text-center">
                 <ExclamationCircleIcon class="w-8 h-8 mx-auto text-red-500"/>
                 <div class="mt-xs">{{ media.name }}</div>
-                <div class="mt-xs text-red-500">{{ media.error ? media.error : 'Error uploading file!' }}</div>
+                <div class="mt-xs text-red-500">{{
+                        media.error ? media.error : $t('media.error_uploading_media')
+                    }}
+                </div>
             </div>
 
             <img
                 :src="media.thumb_url"
                 loading="lazy"
                 alt="Image"
-                class="w-full rounded-md"
+                class="rounded-md"
                 :class="[imgHeightClass, {'w-full': imgWidthFull}]"
             />
         </div>

diff --git a/resources/js/Components/ServiceForm/FacebookServiceForm.vue b/resources/js/Components/ServiceForm/FacebookServiceForm.vue
@@ -49,7 +49,7 @@ const save = () => {
                 <a href="https://developers.facebook.com/apps" class="link" target="_blank">Create an App on
                     Facebook</a>.
             </p>
-            <ReadDocHelp :href="`${$page.props.mixpost.docs_link}/books/services-configuration-mixpost/page/facebook`" class="mt-xs"/>
+            <ReadDocHelp :href="`${$page.props.mixpost.docs_link}/services/social/facebook/`" class="mt-xs"/>
         </template>
 
         <HorizontalGroup class="mt-lg">

diff --git a/resources/js/Components/ServiceForm/TenorServiceForm.vue b/resources/js/Components/ServiceForm/TenorServiceForm.vue
@@ -49,7 +49,7 @@ const save = () => {
                 <a href="https://console.cloud.google.com/" class="link" target="_blank">Create
                     an App on Google Console</a>.
             </p>
-            <ReadDocHelp :href="`${$page.props.mixpost.docs_link}/books/services-configuration-mixpost/page/tenor`" class="mt-xs"/>
+            <ReadDocHelp :href="`${$page.props.mixpost.docs_link}/services/media/tenor`" class="mt-xs"/>
         </template>
 
         <HorizontalGroup class="mt-lg">

diff --git a/resources/js/Components/ServiceForm/TwitterServiceForm.vue b/resources/js/Components/ServiceForm/TwitterServiceForm.vue
@@ -47,7 +47,7 @@ const save = () => {
         <template #description>
             <a href="https://developer.twitter.com/en/portal/projects-and-apps" class="link" target="_blank">Create
                 an App on Twitter</a>. You will need to edit the App Permissions and allow "Read and Write".
-            <ReadDocHelp :href="`${$page.props.mixpost.docs_link}/books/services-configuration-mixpost/page/twitter`" class="mt-xs"/>
+            <ReadDocHelp :href="`${$page.props.mixpost.docs_link}/services/social/x`" class="mt-xs"/>
         </template>
 
         <HorizontalGroup class="mt-lg">

diff --git a/resources/js/Components/ServiceForm/UnsplashServiceForm.vue b/resources/js/Components/ServiceForm/UnsplashServiceForm.vue
@@ -49,7 +49,7 @@ const save = () => {
                 <a href="https://unsplash.com/oauth/applications" class="link" target="_blank">Create
                     an App on Unsplash</a>.
             </p>
-            <ReadDocHelp :href="`${$page.props.mixpost.docs_link}/books/services-configuration-mixpost/page/unsplash`" class="mt-xs"/>
+            <ReadDocHelp :href="`${$page.props.mixpost.docs_link}/services/media//unsplash`" class="mt-xs"/>
         </template>
 
         <HorizontalGroup class="mt-lg">

diff --git a/src/Builders/Filters/PostScheduledAt.php b/src/Builders/Filters/PostScheduledAt.php
@@ -13,8 +13,8 @@ public static function apply(Builder $builder, $value): Builder
         $date = Carbon::parse($value['date']);
 
         if ($value['calendar_type'] === 'month') {
-            return $builder->whereYear('scheduled_at', $date->year)
-                ->whereMonth('scheduled_at', $date->month);
+            return $builder->whereDate('scheduled_at', '>=', $date->clone()->startOfMonth()->subDays(10)->toDateString())
+                ->whereDate('scheduled_at', '<=', $date->clone()->endOfMonth()->addDays(10)->toDateString());
         }
 
         if ($value['calendar_type'] === 'week') {

diff --git a/src/Http/Middleware/HandleInertiaRequests.php b/src/Http/Middleware/HandleInertiaRequests.php
@@ -65,7 +65,7 @@ public function share(Request $request)
                 'name' => Config::get('app.name')
             ],
             'mixpost' => [
-                'docs_link' => 'https://docs.inovector.com',
+                'docs_link' => 'https://docs.mixpost.app',
                 'version' => InstalledVersions::getVersion('inovector/mixpost'),
                 'mime_types' => Config::get('mixpost.mime_types'),
                 'settings' => [

diff --git a/src/SocialProviders/Twitter/Concerns/ManagesResources.php b/src/SocialProviders/Twitter/Concerns/ManagesResources.php
@@ -71,7 +71,7 @@ protected function storePostWithApiV2(string $text, array $mediaResult): SocialP
             $postParameters['media']['media_ids'] = $mediaResult['ids'];
         }
 
-        $postResult = $this->connection->post('tweets', $postParameters, true);
+        $postResult = $this->connection->post('tweets', $postParameters, ['jsonPayload' => true]);
 
         return $this->buildResponse($postResult, function () use ($postResult) {
             return [
@@ -105,7 +105,7 @@ public function uploadMedia(Collection $media): array
                     'media_type' => $item->mime_type,
                     'media_category' => $item->isImageGif() ? 'tweet_gif' : 'tweet_video',
                     'total_bytes' => $item->size,
-                ], true);
+                ], ['chunkedUpload' => true]);
             }
 
             if (!$result) {