Skip to content

Commit 4ee4dc4

Browse files
lethaklethak
committed
2018.1.4b
1 parent 20ba46a commit 4ee4dc4

5 files changed

+64
-18
lines changed

‎DIU.meta.js ‎DIUserscript.meta.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ==UserScript==
2-
// @name Digitally Imported Userscript
2+
// @name DIUserscript for AudioAddict platform
33
// @namespace LTKDIFMU
4-
// @version 2018.1.3
4+
// @version 2018.1.4
55
// @author LethaK Maas
66
// @description Removes afk popup and minimize ads if possible
77
// @include https://*.di.fm*
@@ -11,7 +11,7 @@
1111
// @include https://*.rockradio.com*
1212
// @downloadURL https://raw.githubusercontent.com/lethak/LTKDIFMU-userscript/live/DIUserscript.user.js
1313
// @updateURL https://raw.githubusercontent.com/lethak/LTKDIFMU-userscript/live/DIUserscript.meta.js
14-
// @icon http://i.imgur.com/7yj2PGY.png
14+
// @icon https://i.imgur.com/vhn9FD6.png
1515
// @grant none
1616
// @run-at document-start
1717
// ==/UserScript==

‎DIU.user.js ‎DIUserscript.user.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ==UserScript==
2-
// @name Digitally Imported Userscript
2+
// @name DIUserscript for AudioAddict platforms
33
// @namespace LTKDIFMU
4-
// @version 2018.1.3
4+
// @version 2018.1.4
55
// @author LethaK Maas
66
// @description Removes afk popup and minimize ads if possible
77
// @include https://*.di.fm*
@@ -11,7 +11,7 @@
1111
// @include https://*.rockradio.com*
1212
// @downloadURL https://raw.githubusercontent.com/lethak/LTKDIFMU-userscript/live/DIUserscript.user.js
1313
// @updateURL https://raw.githubusercontent.com/lethak/LTKDIFMU-userscript/live/DIUserscript.meta.js
14-
// @icon http://i.imgur.com/7yj2PGY.png
14+
// @icon https://i.imgur.com/vhn9FD6.png
1515
// @grant none
1616
// @run-at document-start
1717
// ==/UserScript==
@@ -530,7 +530,6 @@
530530
jQuery('<li class="menu-item"><a href="https://github.com/lethak/LTKDIFMU-userscript" target="_blank"><i class="icon-forward"></i> <span>DIUserscript</span></a></li>').appendTo('#side-nav ul');
531531

532532
di.app.commands.execute('message:notice', 'Enjoy free uninterrupted music thanks to DIUserscript !');
533-
di.app.commands.execute('message:warn:persistent', '<strong>A message from DIUserscript</strong>: <br>We are changing our GitHub repository name soon, following a Trademark Claim by "Digitally Imported, Inc". <a href="https://github.com/lethak/LTKDIFMU-userscript/blob/live/DigitallyImportedTrademarkClaim.md" target="_blank">Read more</a> or <a href="https://raw.githubusercontent.com/lethak/LTKDIFMU-userscript/live/DIUserscript.user.js" target="_blank">Click here to update now !</a>');
534533
}, 2000);
535534
};
536535

‎DigitallyImportedTrademarkClaim.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
|Problem|**This repository is going to change its name (and URL) soon following a Trademark claim by "Digitally Imported, Inc"**|
1+
|:warning:|**Our old repository is going to change its name (and URL) soon following a [Trademark claim](./DigitallyImportedTrademarkClaim.md) by "Digitally Imported, Inc"**|
22
|---|---|
33
|Problem|Since the auto-update url was using this repo, its going to break when the change occurs|
4-
|How to solve ?| [Click here](https://raw.githubusercontent.com/lethak/LTKDIFMU-userscript/live/DIUserscript.user.js) to update your DIUserscript now using our new repo |
4+
|How to solve ?| [Click here](https://raw.githubusercontent.com/lethak/LTKDIFMU-userscript/live/DIUserscript.user.js) to update your userscript now using our new repo |
55

66

77
## Subject:

‎README.md

+2-9
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
This userscript is trying to minimize and block audio and visual advertisement on all the websites and radios powered by the AudioAddict platform.
44

5-
|:warning:|**This repository is going to change its name (and URL) soon following a [Trademark claim](./DigitallyImportedTrademarkClaim.md) by "Digitally Imported, Inc"**|
6-
|---|---|
7-
|Problem|Since the auto-update url was using this repo, its going to break when the change occurs|
8-
|How to solve ?| [Click here](https://raw.githubusercontent.com/lethak/LTKDIFMU-userscript/live/DIUserscript.user.js) to update your userscript now using our new repo |
9-
105
## Features
116

127
* Ads: Prevents **all** automated ads to reach your ears, bypassing them.
@@ -20,18 +15,16 @@ This userscript is trying to minimize and block audio and visual advertisement o
2015
* Audio Player: Skip current track button (di.fm only)
2116
* Audio Player: Allowing to manually seek a specific position while playing a track (aka timeline scrubbing)
2217

23-
## Supported sites
18+
## Compatible webradios
2419

25-
5 known websites are partially or totally supported so far, consult the [complete list here](https://www.audioaddict.com).
20+
5 known websites are partially or totally working with DIUserscript so far, consult the [complete list here](https://www.audioaddict.com).
2621

2722
* https://di.fm
2823
* https://classicalradio.com
2924
* https://radiotunes.com
3025
* https://jazzradio.com
3126
* https://rockradio.com
3227

33-
Since I am only using di.fm, please consider helping by [giving feedback](https://github.com/lethak/digitally_imported_userscript/issues/5) for the other sites (what is not working, almost working, etc...)
34-
3528
## Installation
3629

3730
### Disclaimer

‎doc/DigitallyImportedTrademarkClaim.md

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
|:warning:|**Our old repository is going to change its name (and URL) soon following a [Trademark claim](./DigitallyImportedTrademarkClaim.md) by "Digitally Imported, Inc"**|
2+
|---|---|
3+
|Problem|Since the auto-update url was using this repo, its going to break when the change occurs|
4+
|How to solve ?| [Click here](https://raw.githubusercontent.com/lethak/LTKDIFMU-userscript/live/DIUserscript.user.js) to update your userscript now using our new repo |
5+
6+
7+
## Subject:
8+
A note from GitHub regarding your repository
9+
10+
## Meta:
11+
* Date: Fri, 26 Jan 2018 15:20:04 +0000 (UTC)
12+
* From: "Peyton (GitHub Staff)" <[email protected]>
13+
* Message-ID: <discussions/5c4bd38c02ac11e88677f430b99080c7/comments/[email protected]>
14+
15+
## Content:
16+
Hi there,
17+
18+
I'm contacting you on behalf of GitHub support, because we've received a report that your repository name, digitally_imported_userscript, may use another company's registered trademark in a way likely to mislead or cause confusion between the projects. Your repository name seems to be in conflict with the registered trademark "Digitally Imported".
19+
20+
They've contacted us to request that the repository name be changed and all references to Digitally Imported be removed. Keep in mind that I'm simply passing along this information, and these actions and changes are not requests made directly by GitHub.
21+
22+
We'd like to give you a chance to respond, or to clear up the confusion by renaming the repository and removing other references to their registered name from your code. We'll follow up with you in a week. If we don't hear from you or no change is made within that time, we may need to disable the repository in accordance with our GitHub Trademark Policy, which you can find here:
23+
24+
https://help.github.com/articles/github-trademark-policy
25+
26+
Please let me know if you have any questions and I'd be happy to help!
27+
28+
Best,
29+
Peyton
30+
31+
32+
## Forwarded:
33+
Dear Support,
34+
35+
I would like to make a trademark violation complaint against the following user:
36+
37+
Username: https://github.com/lethak
38+
39+
Repository: https://github.com/lethak/digitally_imported_userscript
40+
41+
Our company: Digitally Imported, Inc.
42+
Trademarked word: Digitally Imported
43+
Trademark registration number: 2814807
44+
Trademark registration office: USPTO
45+
46+
Description of confusion:
47+
48+
The user is using our registered trademark as the part of the name for his/her repository, which script contains features that actually harm our business by violating our license agreements and circumventing our advertising revenue. The use of our registered trademark, well known in the market, attracts users to his/her script.
49+
50+
Requested action:
51+
52+
We request that the user cease using our registered trademark immediately in his/her repository name or anywhere else in the repository.
53+
54+
Thank you for attending to this!

0 commit comments

Comments
 (0)