Skip to content

Commit 0221257

Browse files
committed
fix conflict
2 parents b40851e + b8e0d53 commit 0221257

File tree

146 files changed

+2721
-2699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+2721
-2699
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Bug Report
2-
description: Report a YouTube Music bug
2+
description: Report a Pear Desktop bug
33
title: "[Bug]: "
44
labels: "bug :beetle:"
55
body:
@@ -8,17 +8,17 @@ body:
88
label: Preflight Checklist
99
description: Please ensure you've completed all of the following.
1010
options:
11-
- label: I use the latest version of YouTube Music (Application).
11+
- label: I use the latest version of Pear Desktop (Application).
1212
required: true
13-
- label: I have searched the [issue tracker](https://github.com/th-ch/youtube-music/issues) for a bug report that matches the one I want to file, without success.
13+
- label: I have searched the [issue tracker](https://github.com/pear-devs/pear-desktop/issues) for a bug report that matches the one I want to file, without success.
1414
required: true
15-
- label: I understand that **th-ch/youtube-music has NO affiliation with Google or YouTube**
15+
- label: I understand that **pear-devs/pear-desktop has NO affiliation with Google or YouTube**
1616
required: true
1717
- type: input
1818
attributes:
19-
label: YouTube Music (Application) Version
19+
label: Pear Desktop (Application) Version
2020
description: |
21-
What version of the YouTube Music Application are you using?
21+
What version of the Pear Desktop Application are you using?
2222
2323
Note: Please check if this issue is reproducible with the latest stable release.
2424
placeholder: 2.0.0
@@ -28,7 +28,7 @@ body:
2828
attributes:
2929
label: Checklists
3030
options:
31-
- label: I use the portable version of the YouTube Music Application.
31+
- label: I use the portable version of the Pear Desktop Application.
3232
- label: I can reproduce this issue in the [official version of (WEB) YTM](https://music.youtube.com).
3333
- type: dropdown
3434
attributes:
@@ -60,8 +60,8 @@ body:
6060
required: true
6161
- type: input
6262
attributes:
63-
label: Last Known Working YouTube Music (Application) version
64-
description: (If applicable) What is the last version of YouTube Music this worked in?
63+
label: Last Known Working Pear Desktop (Application) version
64+
description: (If applicable) What is the last version of Pear Desktop this worked in?
6565
placeholder: 1.20.0
6666
- type: textarea
6767
attributes:
@@ -92,4 +92,4 @@ body:
9292
- type: textarea
9393
attributes:
9494
label: Additional Information
95-
description: If your problem needs further explanation, or if the issue you're seeing cannot be reproduced in a gist, please add more information here.
95+
description: If your problem needs further explanation, or if the issue you're seeing cannot be reproduced in a gist, please add more information here.

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Feature Request
2-
description: Suggest an idea for YouTube Music
2+
description: Suggest an idea for Pear Desktop
33
title: "[Feature Request]: "
44
labels: "enhancement :sparkles:"
55
body:
@@ -8,9 +8,9 @@ body:
88
label: Preflight Checklist
99
description: Please ensure you've completed all of the following.
1010
options:
11-
- label: I use the latest version of YouTube Music (Application).
11+
- label: I use the latest version of Pear Desktop (Application).
1212
required: true
13-
- label: I have searched the [issue tracker](https://github.com/th-ch/youtube-music/issues) for a feature request that matches the one I want to file, without success.
13+
- label: I have searched the [issue tracker](https://github.com/pear-devs/pear-desktop/issues) for a feature request that matches the one I want to file, without success.
1414
required: true
1515
- type: textarea
1616
attributes:

.github/workflows/build.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build YouTube Music
1+
name: Build Pear Desktop
22

33
on:
44
push:
@@ -10,7 +10,8 @@ env:
1010

1111
jobs:
1212
build:
13-
name: Build YouTube Music
13+
if: github.event.pull_request.draft == false
14+
name: Build Pear Desktop
1415
runs-on: ${{ matrix.os }}
1516
strategy:
1617
fail-fast: true
@@ -44,20 +45,20 @@ jobs:
4445

4546
# Only vite build without release if it is a fork, or it is a pull-request
4647
- name: Vite Build
47-
if: github.repository == 'th-ch/youtube-music' && github.event_name == 'pull_request'
48+
if: github.repository == 'pear-devs/pear-desktop' && github.event_name == 'pull_request'
4849
run: |
4950
pnpm build
5051
5152
# Build and release if it's the main repository and is not pull-request
5253
- name: Build and release on Mac
53-
if: startsWith(matrix.os, 'macOS') && (github.repository == 'th-ch/youtube-music' && github.event_name != 'pull_request')
54+
if: startsWith(matrix.os, 'macOS') && (github.repository == 'pear-devs/pear-desktop' && github.event_name != 'pull_request')
5455
env:
5556
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5657
run: |
5758
pnpm release:mac
5859
5960
- name: Build and release on Linux
60-
if: startsWith(matrix.os, 'ubuntu') && (github.repository == 'th-ch/youtube-music' && github.event_name != 'pull_request')
61+
if: startsWith(matrix.os, 'ubuntu') && (github.repository == 'pear-devs/pear-desktop' && github.event_name != 'pull_request')
6162
env:
6263
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6364
run: |
@@ -71,7 +72,7 @@ jobs:
7172
pnpm release:linux
7273
7374
- name: Build and release on Windows
74-
if: startsWith(matrix.os, 'windows') && (github.repository == 'th-ch/youtube-music' && github.event_name != 'pull_request')
75+
if: startsWith(matrix.os, 'windows') && (github.repository == 'pear-devs/pear-desktop' && github.event_name != 'pull_request')
7576
env:
7677
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7778
run: |
@@ -87,8 +88,8 @@ jobs:
8788

8889
release:
8990
runs-on: ubuntu-latest
90-
name: Release YouTube Music
91-
if: github.repository == 'th-ch/youtube-music' && github.ref == 'refs/heads/master'
91+
name: Release Pear Desktop
92+
if: github.repository == 'pear-devs/pear-desktop' && github.ref == 'refs/heads/master'
9293
needs: build
9394
steps:
9495
- uses: actions/checkout@v5
@@ -149,11 +150,11 @@ jobs:
149150
name: ${{ env.VERSION_TAG }}
150151
replacebody: true
151152
body: |
152-
See [changelog](https://github.com/th-ch/youtube-music/blob/master/changelog.md#${{ env.CHANGELOG_ANCHOR }}) for the list of updates and the full diff.
153+
See [changelog](https://github.com/pear-devs/pear-desktop/blob/master/changelog.md#${{ env.CHANGELOG_ANCHOR }}) for the list of updates and the full diff.
153154
154155
Thanks to all contributors! 🏅
155156
156-
(Note for Windows: `YouTube-Music-Web-Setup-${{ env.VERSION_TAG }}.exe` is an installer, and `YouTube-Music-${{ env.VERSION_TAG }}.exe` is a portable version)
157+
(Note for Windows: `Pear-Desktop-Web-Setup-${{ env.VERSION_TAG }}.exe` is an installer, and `Pear-Desktop-${{ env.VERSION_TAG }}.exe` is a portable version)
157158
158159
- name: Update changelog
159160
if: ${{ env.VERSION_HASH == '' }}

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ permissions:
1212

1313
jobs:
1414
dependency-review:
15+
if: github.event.pull_request.draft == false
1516
runs-on: ubuntu-latest
1617
steps:
1718
- name: "Checkout Repository"

.github/workflows/pr-build-artifacts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ env:
99

1010
jobs:
1111
check-permissions:
12+
if: github.event.pull_request.draft == false
1213
name: Check if user has write access
1314
runs-on: ubuntu-latest
1415
outputs:

.github/workflows/reviewdog.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ env:
77

88
jobs:
99
eslint:
10+
if: github.event.pull_request.draft == false
1011
name: runner / eslint
1112
runs-on: ubuntu-latest
1213
permissions:

.github/workflows/winget-submission.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
- name: Submit package to Windows Package Manager Community Repository
2323
uses: vedantmgoyal2009/winget-releaser@main
2424
with:
25-
identifier: th-ch.YouTubeMusic
26-
installers-regex: '^YouTube-Music-Web-Setup-[\d\.]+\.exe$'
25+
identifier: pear-devs.PearDesktop
26+
installers-regex: '^Pear-Desktop-Web-Setup-[\d\.]+\.exe$'
2727
version: ${{ env.WINGET_TAG_NAME }}
2828
release-tag: ${{ inputs.tag_name || github.event.release.tag_name }}
2929
token: ${{ secrets.WINGET_ACC_TOKEN }}
30-
fork-user: youtube-music-winget
30+
fork-user: pear-desktop-winget

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![eslint code style](https://img.shields.io/badge/code_style-eslint-5ed9c7.svg?style=for-the-badge)](https://github.com/pear-devs/pear-desktop/blob/master/eslint.config.mjs)
88
[![Build status](https://img.shields.io/github/actions/workflow/status/pear-devs/pear-desktop/build.yml?branch=master&style=for-the-badge)](https://GitHub.com/pear-devs/pear-desktop/releases/)
99
[![GitHub All Releases](https://img.shields.io/github/downloads/pear-devs/pear-desktop/total?style=for-the-badge)](https://GitHub.com/pear-devs/pear-desktop/releases/)
10-
<!--[![AUR](https://img.shields.io/aur/version/youtube-music-bin?color=blueviolet&style=for-the-badge)](https://aur.archlinux.org/packages/youtube-music-bin)-->
10+
<!--[![AUR](https://img.shields.io/aur/version/pear-desktop-bin?color=blueviolet&style=for-the-badge)](https://aur.archlinux.org/packages/pear-desktop-bin)-->
1111
[![Known Vulnerabilities](https://snyk.io/test/github/pear-devs/pear-desktop/badge.svg)](https://snyk.io/test/github/pear-devs/pear-desktop)
1212

1313
</div>
@@ -16,19 +16,19 @@
1616

1717
- Native look & feel extension
1818

19-
> [!IMPORTANT]
19+
> [!IMPORTANT]
2020
> ⚠️ Disclaimer
2121
>
2222
> **No Affiliation**
23-
>
23+
>
2424
> This project, and its contributors, are not affiliated with, authorized by, endorsed by, or in any way officially connected with Google LLC, YouTube, or any of their subsidiaries or affiliates. **This is an independent, non-profit, and unofficial extension developed by a team of volunteers with the goal of providing a desktop experience.**
2525
>
2626
> **Trademarks**
27-
>
27+
>
2828
> The names "Google" and "YouTube Music", as well as related names, marks, emblems, and images, are registered trademarks of their respective owners. Any use of these trademarks is for identification and reference purposes only and does not imply any association with the trademark holder. We have no intention of infringing upon these trademarks or causing harm to the trademark holders.
2929
>
3030
> **Limitation of Liability**
31-
>
31+
>
3232
> This application (extension) is provided "AS IS", and you use it at your own risk. In no event shall the developers or contributors be liable for any claim, damages, or other liability, including any legal consequences, arising from, out of, or in connection with the software or the use or other dealings in the software. The responsibility for any and all outcomes of using this software rests entirely with the user.
3333
3434
## Content
@@ -53,11 +53,11 @@
5353

5454
## Translation
5555

56-
You can help with translation on [Hosted Weblate](https://hosted.weblate.org/projects/youtube-music/).
56+
You can help with translation on [Hosted Weblate](https://bit.ly/48n5YF7).
5757

58-
<a href="https://hosted.weblate.org/engage/youtube-music/">
59-
<img src="https://hosted.weblate.org/widget/youtube-music/i18n/multi-auto.svg" alt="translation status" />
60-
<img src="https://hosted.weblate.org/widget/youtube-music/i18n/287x66-black.png" alt="translation status 2" />
58+
<a href="https://bit.ly/48n5YF7/">
59+
<img src="https://bit.ly/4q83L6S" alt="translation status" />
60+
<img src="https://bit.ly/4h3zBxo" alt="translation status 2" />
6161
</a>
6262

6363
## Download

assets/error.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<meta charset="utf-8" />
5-
<title>Cannot load YouTube Music</title>
5+
<title>Cannot load Pear Desktop</title>
66
<style>
77
body {
88
background: #000;
@@ -43,7 +43,7 @@
4343

4444
<body>
4545
<div class="container">
46-
<p>Cannot load YouTube Music… Internet disconnected?</p>
46+
<p>Cannot load Pear Desktop… Internet disconnected?</p>
4747
<a class="button" href="#" onclick="reload()">Retry</a>
4848
</div>
4949
</body>

0 commit comments

Comments
 (0)