@saooti/octopus-sdk 31.0.20 → 31.0.23

package/README.md

@@ -596,3 +596,6 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 31.0.18 Bug #11015
  * 31.0.19 Add access_token player
  * 31.0.20 Player mobile
+ * 31.0.21 Player mobile
+ * 31.0.22 Merge 30
+ * 31.0.23 Qr Code option noir

package/index.ts

@@ -15,7 +15,7 @@ import Rubrique from "./src/components/pages/Rubrique.vue";
 //Misc
 import Footer from "./src/components/misc/Footer.vue";
 import LeftMenu from "./src/components/misc/LeftMenu.vue";
-import Player from "./src/components/misc/Player.vue";
+import Player from "./src/components/misc/player/Player.vue";
 import Snackbar from "./src/components/misc/Snackbar.vue";
 import TopBar from "./src/components/misc/TopBar.vue";
 import HomeDropdown from "./src/components/misc/HomeDropdown.vue";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "31.0.20",
+  "version": "31.0.23",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -14,7 +14,7 @@
   },
   "main": "./dist/octopus.common.js",
   "dependencies": {
-    "@saooti/octopus-api": "^0.31.2",
+    "@saooti/octopus-api": "^0.31.3",
     "@vue/cli": "^5.0.4",
     "@vue/compat": "^3.2.31",
     "axios": "^0.24.0",

package/src/components/display/sharing/QrCode.vue

@@ -8,6 +8,13 @@
       class="myQrCode"
       :margin="2" 
     />
+    <ClassicCheckbox
+      v-if="'#000000'!==otherColor"
+      v-model:textInit="isNotBlack"
+      class="flex-shrink-0"
+      id-checkbox="is-black-qr-code"
+      :label="$t('Use organization color')"
+    />
     <button
       class="btn m-3"
       @click="download"
@@ -22,6 +29,7 @@
 </template>
 
 <script lang="ts">
+import ClassicCheckbox from '../../form/ClassicCheckbox.vue';
 import { state } from '../../../store/paramStore';
 import octopusApi from '@saooti/octopus-api';
 import Snackbar from '../../misc/Snackbar.vue';
@@ -33,7 +41,8 @@ export default defineComponent({
 
   components: {
     Snackbar,
-    QrcodeVue
+    QrcodeVue,
+    ClassicCheckbox
   },
   props: {
     url: { default: '', type: String},
@@ -42,7 +51,9 @@ export default defineComponent({
   data() {
     return {
       size: 200 as number,
-      color: "#40a372" as string
+      color: "#000000" as string,
+      otherColor:"#000000" as string,
+      isNotBlack: false as boolean,
     };
   },
   computed:{
@@ -50,6 +61,15 @@ export default defineComponent({
       return (state.generalParameters.authenticated as boolean);
     },
   },
+  watch:{
+    isNotBlack(){
+      if(this.isNotBlack){
+        this.color = this.otherColor;
+      }else{
+        this.color = "#000000";
+      }
+    }
+  },
   created(){
     this.initColor();
   },
@@ -66,7 +86,7 @@ export default defineComponent({
     },
     async initColor(): Promise<void> {
       if(state.generalParameters.podcastmaker && state.generalParameters.podcastmakerColor){
-        this.color = state.generalParameters.podcastmakerColor;
+        this.otherColor = state.generalParameters.podcastmakerColor;
         return;
       }
       if (!this.authenticated) return;
@@ -79,7 +99,7 @@ export default defineComponent({
         );
       }
       if (Object.prototype.hasOwnProperty.call(data,'COLOR')) {
-        this.color = data.COLOR;
+        this.otherColor = data.COLOR;
       }
     },
   }

package/src/components/misc/player/Player.vue

@@ -11,7 +11,7 @@
       <template v-if="display">
         <audio
           id="audio-player"
-          :src="!live? audioUrl: undefined"
+          :src="!live? audioUrlToPlay: undefined"
           autoplay
           @timeupdate="onTimeUpdate"
           @ended="onFinished"
@@ -82,6 +82,7 @@ export default defineComponent({
       comments: [] as Array<CommentPodcast>,
       showTimeline: false as boolean,
       largeVersion: false as boolean,
+      audioUrlToPlay: "" as string
     };
   },
   computed: {

package/src/components/mixins/player/playerDisplay.ts

@@ -1,6 +1,6 @@
 import { Podcast } from '@/store/class/general/podcast';
 import DurationHelper from '../../../helper/duration';
-import { state } from '@/store/paramStore';
+import { state } from '../../../store/paramStore';
 import { defineComponent } from 'vue';
 import { RouteLocationRaw } from 'vue-router';
 export const playerDisplay = defineComponent({

package/src/components/mixins/player/playerLive.ts

@@ -100,11 +100,15 @@ export const playerLive = defineComponent({
     },
     async endListeningProgress(): Promise<void> {
       if (!this.downloadId) return;
-      await octopusApi.updatePlayerTime(
-        this.downloadId,
-        Math.round(this.listenTime)
-      );
-      this.setDownloadId(null);
+      try {
+        await octopusApi.updatePlayerTime(
+          this.downloadId,
+          Math.round(this.listenTime)
+        );
+      } catch{
+        //Do nothing
+      }
+      this.downloadId = null;
       this.notListenTime = 0;
       this.lastSend = 0;
       this.listenTime = 0;

package/src/components/mixins/player/playerLogic.ts

@@ -23,6 +23,7 @@ export const playerLogic = defineComponent({
       hlsReady: false as boolean,
       comments: [] as Array<CommentPodcast>,
       showTimeline: false as boolean,
+      audioUrlToPlay: "" as string
     };
   },
   computed: {
@@ -44,8 +45,15 @@ export const playerLogic = defineComponent({
   },
 
   watch: {
-    audioUrl(): void{
+    async audioUrl(): Promise<void>{
       this.playerError = false;
+      if(this.media || !this.podcast || !this.podcast.availability.visibility ||this.listenError){
+        this.audioUrlToPlay = this.audioUrl;
+      }
+      if(!this.podcast){return;}
+      const response = await octopusApi.fetchPodcastDownloadUrl("podcast/download/register/"+this.podcast.podcastId+".mp3"+ this.audioUrl);
+      this.setDownloadId(response.downloadId.toString());
+      this.audioUrlToPlay = response.location;
     },
     podcast: {
       deep: true,
@@ -88,6 +96,14 @@ export const playerLogic = defineComponent({
   },
   
   methods: {
+    getDomain(): string{
+      let domain = "";
+      const domainArray: RegExpExecArray | null = /\.(.+)/.exec(window.location.host);
+      if(domainArray &&  null !== domainArray){
+        domain = domainArray[1];
+      }
+      return domain;
+    },
     getAudioUrl(): string{
       if (this.media) return this.media.audioUrl? this.media.audioUrl:"";
       if (!this.podcast) return '';
@@ -96,7 +112,6 @@ export const playerLogic = defineComponent({
       if (this.listenError) return this.podcast.audioStorageUrl;
       const parameters = [];
       parameters.push('origin=octopus');
-      parameters.push('cookieName=player_' + this.podcast.podcastId);
       parameters.push('listenerId='+this.getListenerId());
       if (
         this.$store.state.authentication &&
@@ -109,7 +124,7 @@ export const playerLogic = defineComponent({
       if("SECURED" === this.podcast.organisation.privacy && this.$store.state.authentication.isAuthenticated && this.$store.state.oAuthParam.accessToken){
         parameters.push('access_token='+this.$store.state.oAuthParam.accessToken);
       }
-      return this.podcast.audioUrl + '?' + parameters.join('&');
+      return this.podcast.podcastId + '.mp3?' + parameters.join('&');
     },
     reInitPlayer():void{
       this.setDownloadId(null);
@@ -123,12 +138,7 @@ export const playerLogic = defineComponent({
       let listenerId = this.getCookie("octopus_listenerId");
       if(!listenerId){
         listenerId = new Date().valueOf().toString() + Math.random();
-        let domain = "";
-        const domainArray: RegExpExecArray | null = /\.(.+)/.exec(window.location.host);
-        if(domainArray &&  null !== domainArray){
-          domain = domainArray[1];
-        }
-        this.setCookie("octopus_listenerId", listenerId, ';domain='+domain);
+        this.setCookie("octopus_listenerId", listenerId, ';domain='+this.getDomain());
       }
       return listenerId;
     },
@@ -153,9 +163,9 @@ export const playerLogic = defineComponent({
       );
     },
     onError(): void {
-      if (this.podcast && !this.listenError) {
+      if (this.podcast && ""!==this.audioUrlToPlay &&  !this.listenError) {
         this.listenError = true;
-      } else if (this.podcast || this.media) {
+      } else if ((this.podcast && ""!==this.audioUrlToPlay ) || this.media) {
         this.playerError = true;
       }
     },
@@ -163,7 +173,7 @@ export const playerLogic = defineComponent({
       const mediaTarget = (event.currentTarget as HTMLMediaElement);
       if (this.podcast || this.live) {
         if (!this.downloadId) {
-          this.loadDownloadId();
+          return;
         }
         if (
           this.live &&
@@ -214,21 +224,5 @@ export const playerLogic = defineComponent({
       }
       this.forceHide = true;
     },
-    loadDownloadId(): void {
-      if (!this.podcast) return;
-      const matching_cookies = document.cookie
-        .split(';')
-        .map(item => {
-          const _return = item.trim().split('=');
-          return _return.map(item => item.trim());
-        })
-        .filter(item => {
-          if(!this.podcast){return '';}
-          return 'player_' + this.podcast.podcastId === item[0];
-        });
-      if (1 === matching_cookies.length) {
-        this.setDownloadId(matching_cookies[0][1]);
-      }
-    },
   },
 })

package/src/locale/de.ts

@@ -299,4 +299,5 @@ export default{
   'Podcast tags': "Podcast-Tags",
   "Enlarge":"Vergrößern",
   "Reduce":"Reduzieren",
+  "Use organization color":"Verwenden Sie die Organisationsfarbe",
 }

package/src/locale/en.ts

@@ -300,4 +300,5 @@ export default{
   "You do not have the right to access this page":"You do not have the right to access this page",
   "Enlarge":"Enlarge",
   "Reduce":"Reduce",
+  "Use organization color":"Use organization color",
 };

package/src/locale/es.ts

@@ -299,4 +299,5 @@ export default{
   'Podcast tags': 'Etiquetas de pódcast',
   "Enlarge":"Agrandar",
   "Reduce":"Reducir",
+  "Use organization color":"Usar el color de la organización",
 }

package/src/locale/fr.ts

@@ -300,4 +300,5 @@ export default{
   "You do not have the right to access this page":"Vous n’avez pas le droit d’accéder à cette page",
   "Enlarge":"Agrandir",
   "Reduce":"Réduire",
+  "Use organization color":"Utiliser la couleur de l'organisation",
 };

package/src/locale/it.ts

@@ -297,4 +297,5 @@ export default{
     'More episodes of this category : ': "Altri episodi su questo tema : {name}",
     "Enlarge":"Ingrandire",
     "Reduce":"Ridurre",
+    "Use organization color":"Usa il colore dell'organizzazione",
   };

package/src/locale/sl.ts

@@ -299,4 +299,5 @@ export default{
   'Podcast tags': 'Oznake podkastov',
   "Enlarge":"Povečaj",
   "Reduce":"Zmanjšaj",
+  "Use organization color":"Uporabite barvo organizacije",
 }