Skip to content

Commit

Permalink
Update files copyright headers and minor cleanup (#1250)
Browse files Browse the repository at this point in the history
* clean and update copyright headers
* clang format on pdq/cpp file and update name of format checks
* add ignore format check for CImg.h"
  • Loading branch information
BarrettOlson authored Jan 18, 2023
1 parent d0c5699 commit cfb4bb4
Show file tree
Hide file tree
Showing 570 changed files with 1,925 additions and 1,932 deletions.
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
# Copyright (c) Meta Platforms, Inc. and affiliates.

python-threatexchange:
- python-threatexchange/**/*
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/golang-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: API Reference Examples CI - Go
on:
push:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/hma-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: HMA CI
on:
pull_request:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/hma-webapp-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: hasher-matcher-actioner-webapp CI
on:
push:
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/pdq-ci-cpp-format.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

# From: https://github.com/marketplace/actions/clang-format-check#multiple-paths
name: clang-format Check
name: pdq clang-format Check
on:
push:
branches:
Expand All @@ -12,7 +14,7 @@ on:
- main
paths:
- "pdq/cpp/**"
- ".github/workflows/pdq-ci-cpp-format.yml"
- ".github/workflows/pdq-ci-cpp-format.yml"

jobs:
formatting-check:
Expand All @@ -24,4 +26,5 @@ jobs:
uses: jidicula/[email protected]
with:
clang-format-version: '14'
check-path: 'pdq/cpp'
check-path: 'pdq/cpp'
exclude-regex: 'CImg\.h'
2 changes: 2 additions & 0 deletions .github/workflows/pdq-ci-cpp.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: pdq CI - cpp
on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: "PR Labels"
on:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/python-threatexchange-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: python-threatexchange CI
on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-threatexchange-release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: Publish threatexchange to pypi

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/repo-stale-issues.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: Close stale issues
on:
schedule:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/tmk-ci-cpp-format.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

# From: https://github.com/marketplace/actions/clang-format-check#multiple-paths
name: clang-format Check
name: tmk clang-format Check
on:
push:
branches:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tmk-ci-cpp.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: tmk CI - cpp
on:
push:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/vpdq-ci-cpp-format.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

# From: https://github.com/marketplace/actions/clang-format-check#multiple-paths
name: clang-format Check vpdq
name: vpdq clang-format Check vpdq
on:
push:
branches:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/vpdq-ci-cpp.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: vpdq CI - cpp
on:
push:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/vpdq-ci-python.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: vpdq python CI
on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vpdq-release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
# Copyright (c) Meta Platforms, Inc. and affiliates.

name: Publish vpdq to pypi

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ BSD License

For ThreatExchange software

Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
Copyright (c) Meta Platforms, Inc. and affiliates.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion api-reference-examples/go/threatexchange/threatexchange.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
package threatexchange

import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
package threatexchange

import (
Expand Down
2 changes: 1 addition & 1 deletion api-reference-examples/java/te-tag-query/APIExamples.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.

// ================================================================
// The main reference tooling is com/facebook/threatexchange/TETagQuery.java,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ================================================================
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
// ================================================================

package com.facebook.threatexchange;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ================================================================
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
// ================================================================

package com.facebook.threatexchange;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ================================================================
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
// ================================================================

package com.facebook.threatexchange;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ================================================================
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
// ================================================================

package com.facebook.threatexchange;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ================================================================
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
// ================================================================

package com.facebook.threatexchange;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ================================================================
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
// ================================================================

package com.facebook.threatexchange;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ================================================================
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
// ================================================================

package com.facebook.threatexchange;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.

package com.facebook.threatexchange;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ================================================================
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
// ================================================================

package com.facebook.threatexchange;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ================================================================
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
// ================================================================

package com.facebook.threatexchange;
Expand Down
2 changes: 1 addition & 1 deletion api-reference-examples/js/node/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
var ThreatExchange = require('./lib/threatexchange');
exports.createThreatExchange = function createThreatExchange(app_id,app_secret) {
return ThreatExchange(app_id,app_secret);
Expand Down
2 changes: 1 addition & 1 deletion api-reference-examples/js/node/lib/threatexchange.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
var request = require('request');
var vocabulary = require('./vocabulary');

Expand Down
2 changes: 1 addition & 1 deletion api-reference-examples/js/node/lib/vocabulary.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
exports.v_ThreatExchange = {
URL : "https://graph.facebook.com/",
VERSION : "v2.3/",
Expand Down
2 changes: 1 addition & 1 deletion api-reference-examples/js/node/test/test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
// Copyright (c) Meta Platforms, Inc. and affiliates.
var mocha = require('mocha');
var assert = require('assert');
var should = require('chai').should;
Expand Down
3 changes: 1 addition & 2 deletions api-reference-examples/php/BaseSearch.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
/*
* Copyright (c) 2014-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
Expand Down
3 changes: 1 addition & 2 deletions api-reference-examples/php/BaseUpload.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
/*
* Copyright (c) 2014-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
Expand Down
3 changes: 1 addition & 2 deletions api-reference-examples/php/IndicatorSearch.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
/*
* Copyright (c) 2014-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
Expand Down
3 changes: 1 addition & 2 deletions api-reference-examples/php/IndicatorUpload.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
/*
* Copyright (c) 2014-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
Expand Down
24 changes: 0 additions & 24 deletions api-reference-examples/php/MalwareFamilySearch.php

This file was deleted.

45 changes: 0 additions & 45 deletions api-reference-examples/php/MalwareSearch.php

This file was deleted.

3 changes: 1 addition & 2 deletions api-reference-examples/php/ThreatExchangeConfig.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
/*
* Copyright (c) 2014-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
Expand Down
3 changes: 1 addition & 2 deletions api-reference-examples/php/ThreatExchangeUtils.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
/*
* Copyright (c) 2014-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
Expand Down
3 changes: 1 addition & 2 deletions api-reference-examples/php/query_file.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#
# Copyright (c) 2014-present, Facebook, Inc.
# All rights reserved.
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
Expand Down
3 changes: 1 addition & 2 deletions api-reference-examples/php/search.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
/*
* Copyright (c) 2014-present, Facebook, Inc.
* All rights reserved.
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
Expand Down
3 changes: 1 addition & 2 deletions api-reference-examples/php/search_usage.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#
# Copyright (c) 2014-present, Facebook, Inc.
# All rights reserved.
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
Expand Down
Loading

0 comments on commit cfb4bb4

Please sign in to comment.